diff --git a/imports/NeoChat/Component/ChatBox/CompletionMenu.qml b/imports/NeoChat/Component/ChatBox/CompletionMenu.qml
index 6f65b514d..f225ba27c 100644
--- a/imports/NeoChat/Component/ChatBox/CompletionMenu.qml
+++ b/imports/NeoChat/Component/ChatBox/CompletionMenu.qml
@@ -46,6 +46,7 @@ Popup {
     implicitHeight: Math.min(completionListView.contentHeight, Kirigami.Units.gridUnit * 5)
 
     contentItem: ScrollView {
+        ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
         ListView {
             id: completionListView
             implicitWidth: contentWidth
diff --git a/imports/NeoChat/Component/Timeline/TextDelegate.qml b/imports/NeoChat/Component/Timeline/TextDelegate.qml
index 2483695e2..5b69c6238 100644
--- a/imports/NeoChat/Component/Timeline/TextDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/TextDelegate.qml
@@ -39,7 +39,7 @@ a{
 }
 
 .user-pill{}
-</style>" + (isEmote ? "* <a href='https://matrix.to/#/" + author.id + "' style='color: " + author.color + "'>" + author.displayName + "</a> " : "") + model.display + (isEdited ? (" <span style=\"color: " + Kirigami.Theme.disabledTextColor + "\">" + "<span style='font-size: " + Kirigani.Theme.defaultFont.pixelSize +"px'>" + i18n(" (edited)") + "</span>") : "")
+</style>" + (isEmote ? "* <a href='https://matrix.to/#/" + author.id + "' style='color: " + author.color + "'>" + author.displayName + "</a> " : "") + model.display + (isEdited ? (" <span style=\"color: " + Kirigami.Theme.disabledTextColor + "\">" + "<span style='font-size: " + Kirigami.Theme.defaultFont.pixelSize +"px'>" + i18n(" (edited)") + "</span>") : "")
 
     color: Kirigami.Theme.textColor
     font.pointSize: !replyVisible && isEmoji.test(model.display) ? Kirigami.Theme.defaultFont.pointSize * 4 : Kirigami.Theme.defaultFont.pointSize
diff --git a/imports/NeoChat/Component/Timeline/TimelineContainer.qml b/imports/NeoChat/Component/Timeline/TimelineContainer.qml
index d721a49d0..b883d8e25 100644
--- a/imports/NeoChat/Component/Timeline/TimelineContainer.qml
+++ b/imports/NeoChat/Component/Timeline/TimelineContainer.qml
@@ -13,6 +13,7 @@ import NeoChat.Component 1.0
 import NeoChat.Dialog 1.0
 
 QQC2.ItemDelegate {
+    id: messageDelegate
     default property alias innerObject : column.children
     readonly property bool sentByMe: author.isLocalUser
     readonly property bool darkBackground: !sentByMe
@@ -71,6 +72,7 @@ QQC2.ItemDelegate {
             Layout.rightMargin: Kirigami.Units.smallSpacing
             Layout.bottomMargin: 0
             Layout.topMargin: model.showAuthor ? Kirigami.Units.smallSpacing : 0
+            Layout.fillWidth: true
 
             Kirigami.Avatar {
                 Layout.minimumWidth: Kirigami.Units.gridUnit * 2
@@ -104,15 +106,15 @@ QQC2.ItemDelegate {
                 visible: !model.showAuthor && Config.showAvatarInTimeline
             }
 
-            QQC2.ItemDelegate {
+            QQC2.Control {
                 id: bubble
-                Layout.maximumWidth: mainColumn.width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 2
                 implicitHeight: contentItem.implicitHeight + topPadding
                 topPadding: Kirigami.Units.largeSpacing
                 bottomPadding: 0
                 leftPadding: 0
                 rightPadding: 0
                 hoverEnabled: true
+                Layout.maximumWidth: mainColumn.width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 2
 
                 contentItem: ColumnLayout {
                     id: column
@@ -173,6 +175,9 @@ QQC2.ItemDelegate {
                     border.width: Kirigami.Units.devicePixelRatio
                 }
             }
+            Item {
+                Layout.fillWidth: true
+            }
         }
         Loader {
             id: loader
diff --git a/imports/NeoChat/Page/RoomPage.qml b/imports/NeoChat/Page/RoomPage.qml
index 2a1a5cb08..aa2a7efd9 100644
--- a/imports/NeoChat/Page/RoomPage.qml
+++ b/imports/NeoChat/Page/RoomPage.qml
@@ -377,6 +377,7 @@ Kirigami.ScrollablePage {
             DelegateChoice {
                 roleValue: "emote"
                 delegate: TimelineContainer {
+                    id: emoteContainer
                     width: messageListView.width
                     isLoaded: timelineDelegateChooser.delegateLoaded
                     isEmote: true
@@ -387,8 +388,8 @@ Kirigami.ScrollablePage {
                     innerObject: TextDelegate {
                         isEmote: true
                         Layout.fillWidth: true
-  
-                       Layout.rightMargin: Kirigami.Units.largeSpacing
+                        Layout.maximumWidth: emoteContainer.width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 4
+                        Layout.rightMargin: Kirigami.Units.largeSpacing
                         Layout.leftMargin: Kirigami.Units.largeSpacing
                         Layout.bottomMargin: Kirigami.Units.largeSpacing * 2
                         TapHandler {
@@ -406,6 +407,7 @@ Kirigami.ScrollablePage {
             DelegateChoice {
                 roleValue: "message"
                 delegate: TimelineContainer {
+                    id: messageContainer
                     width: messageListView.width
                     isLoaded: timelineDelegateChooser.delegateLoaded
                     onReplyClicked: goToEvent(eventID)
@@ -414,6 +416,7 @@ Kirigami.ScrollablePage {
 
                     innerObject: TextDelegate {
                         Layout.fillWidth: true
+                        Layout.maximumWidth: messageContainer.width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 4
                         Layout.rightMargin: Kirigami.Units.largeSpacing
                         Layout.bottomMargin: Kirigami.Units.largeSpacing
                         Layout.leftMargin: Kirigami.Units.largeSpacing
@@ -432,6 +435,7 @@ Kirigami.ScrollablePage {
             DelegateChoice {
                 roleValue: "notice"
                 delegate: TimelineContainer {
+                    id: noticeContainer
                     width: messageListView.width
                     isLoaded: timelineDelegateChooser.delegateLoaded
                     onReplyClicked: goToEvent(eventID)
@@ -439,6 +443,7 @@ Kirigami.ScrollablePage {
                     hoverComponent: hoverActions
                     innerObject: TextDelegate {
                         Layout.fillWidth: true
+                        Layout.maximumWidth: noticeContainer.width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 4
                         Layout.rightMargin: Kirigami.Units.largeSpacing
                         Layout.leftMargin: Kirigami.Units.largeSpacing
                         Layout.bottomMargin: Kirigami.Units.largeSpacing * 2
diff --git a/org.kde.neochat.appdata.xml b/org.kde.neochat.appdata.xml
index f62479fad..7924d07c7 100644
--- a/org.kde.neochat.appdata.xml
+++ b/org.kde.neochat.appdata.xml
@@ -79,8 +79,8 @@
     <p xml:lang="uk">Клієнт matrix, децентралізованого протоколу обміну даними.</p>
     <p xml:lang="x-test">xxA client for matrix, the decentralized communication protocol.xx</p>
   </description>
-  <url type="homepage">https://kde.org</url>
-  <url type="bugtracker">https://bugs.kde.org</url>
+  <url type="homepage">https://apps.kde.org/neochat/</url>
+  <url type="bugtracker">https://invent.kde.org/network/neochat/-/issues</url>
   <categories>
     <category>Network</category>
   </categories>
diff --git a/src/actionshandler.cpp b/src/actionshandler.cpp
index d23cfb6eb..4c66e792e 100644
--- a/src/actionshandler.cpp
+++ b/src/actionshandler.cpp
@@ -113,7 +113,7 @@ void ActionsHandler::postMessage(const QString &text,
                                      "#aa00ff", "#d400ff", "#ff00ff", "#ff00d4", "#ff00aa", "#ff0080", "#ff0055", "#ff002b", "#ff0000"};
 
     if (cleanedText.indexOf(shrugPrefix) == 0) {
-        cleanedText = QStringLiteral("¯\\\\_(ツ)\\_/¯") % cleanedText.remove(0, shrugPrefix.length());
+        cleanedText = QStringLiteral("¯\\_(ツ)_/¯") % cleanedText.remove(0, shrugPrefix.length());
         m_room->postHtmlMessage(cleanedText, cleanedText, messageEventType, replyEventId, editEventId);
         return;
     }