diff --git a/src/qml/messages/SystemMessage.qml b/src/qml/messages/SystemMessage.qml
index adb53621..09a47ae0 100644
--- a/src/qml/messages/SystemMessage.qml
+++ b/src/qml/messages/SystemMessage.qml
@@ -1,155 +1,159 @@
 /*
  * <one line to give the program's name and a brief idea of what it does.>
  * Copyright 2016  Riccardo Iaconelli <riccardo@kde.org>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License or (at your option) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
 
 import QtQuick 2.0
 // import "marked.js" as Markdown
 // import "js/marked.js" as MarkDown;
 
 import QtQuick.Controls 2.2
 import org.kde.kirigami 2.1 as Kirigami
 
 import QtQuick.Layouts 1.1
 
 Rectangle {
 
     function getTextFor(type) {
         
         if (type === "uj") {
             return qsTr("has joined the channel");
         } else if (type === "ul") {
             return qsTr("has left the channel");
         } else if (type === "room_changed_topic") {
             return qsTr("changed topic to: <i>%1</i>").arg(i_messageText)
         } else if (type === "au") {
             return qsTr("added %1 to the conversation").arg(i_messageText)
         } else if (type === "r") {
             return qsTr("changed room name to <a href=\"ruqola:/room/%1\">#%1</a>").arg(i_messageText)
         } else if (type === "room_changed_description") {
             return qsTr("changed room description to %1").arg(i_messageText)
         }  else if (type === "room_changed_privacy") {
             return qsTr("changed room privacy to %1").arg(i_messageText)
         } else {
             console.log("Unkown type for message");
             console.log(type);
             console.log(i_messageText)
             return qsTr("Unknown action!");
         }
     }
 
     property string i_messageText
     property string i_username
     property bool i_systemMessage
     property string i_systemMessageType
     property var i_timestamp
 
     signal linkActivated(string link)
     
     id: messageMain
     color: "#eeeeee"
     implicitHeight: 2*Kirigami.Units.smallSpacing + textLabel.implicitHeight
     
     implicitWidth: 150
     
     anchors.bottomMargin: 200
     
 //     anchors.margins: 50
 
     Rectangle {
         
         anchors.rightMargin: 2*Kirigami.Units.largeSpacing
         anchors.leftMargin: 2*Kirigami.Units.largeSpacing
         
         anchors.centerIn: parent
-        width: textLabel.width + 6*Kirigami.Units.smallSpacing
-        height: textLabel.height //+ 2*Kirigami.Units.smallSpacing
+        
+        width: textLabel.implicitWidth + 6*Kirigami.Units.smallSpacing
+        height: textLabel.height
+        
         color: Kirigami.Theme.disabledTextColor
-//         opacity: .2
-
-        radius: height
+        radius: 4*Kirigami.Units.smallSpacing
         
-        Kirigami.Label {
-            id: textLabel
-            color: Kirigami.Theme.textColor
-            opacity: 1
-            
-            anchors.centerIn: parent
-            anchors.leftMargin: Kirigami.Units.smallSpacing
-            anchors.rightMargin: Kirigami.Units.smallSpacing
-            
-            text: i_username + " " + getTextFor(i_systemMessageType)
-                
-            wrapMode: Label.Wrap
-            
-            renderType: Text.NativeRendering
+    }
+    
+    
+    Kirigami.Label {
+        id: textLabel
+        color: Kirigami.Theme.textColor
+        opacity: 1
+        
+        anchors.centerIn: parent
+        anchors.leftMargin: Kirigami.Units.smallSpacing
+        anchors.rightMargin: Kirigami.Units.smallSpacing
+        
+        width: Math.min(implicitWidth, parent.width - Kirigami.Units.largeSpacing)
+        
+        text: i_username + " " + getTextFor(i_systemMessageType)
             
-            onLinkActivated: messageMain.linkActivated(link)
-        }
+        wrapMode: Label.Wrap
+        
+        renderType: Text.NativeRendering
+        
+        onLinkActivated: messageMain.linkActivated(link)
     }
             
 //     Rectangle {
 //         
 //         anchors.topMargin: Kirigami.Units.smallSpacing
 //         
 //         anchors.centerIn: parent
 //         color: "red"
 //         anchors.top: parent.top
 //         anchors.bottom: parent.bottom
 //         
 //         
 //         
 // //         spacing: Kirigami.Units.smallSpacing
 //         
 //         Rectangle {
 //             id: textRect
 //             color: "blue"
 //             radius: height
 //             
 //             anchors.fill: parent
 //             
 // //             color: "#eeeeee"
 // //             anchors.top: parent.top
 // //             anchors.bottom: parent.bottom
 //             anchors.bottomMargin:  Kirigami.Units.smallSpacing
 // //             anchors.horizontalCenter: parent.horizontalCenter
 //             
 // //             height: textLabel.implicitHeight + usernameLabel.implicitHeight
 //             
 //            
 //         }
 
 //         Kirigami.Label {
 //             id: timeLabel
 //             text: "["+(new Date(i_timestamp)).toLocaleTimeString(Locale.ShortFormat)+"]"
 // 
 //             anchors.top: parent.top
 //             anchors.bottom: parent.bottom
 //             
 //             color: Kirigami.Theme.textColor
 //             opacity: .5
 //             
 //             z:1
 //         }
 //     }
 //    
 
 }