diff --git a/gotify_tray/gui/designs/widget_message.py b/gotify_tray/gui/designs/widget_message.py
index 4211280..8c2c14f 100644
--- a/gotify_tray/gui/designs/widget_message.py
+++ b/gotify_tray/gui/designs/widget_message.py
@@ -30,10 +30,10 @@ class Ui_Form(object):
         self.pb_delete.setFlat(True)
         self.pb_delete.setObjectName("pb_delete")
         self.gridLayout_frame.addWidget(self.pb_delete, 0, 4, 1, 1)
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
+        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Maximum, QtWidgets.QSizePolicy.Policy.Minimum)
         self.gridLayout_frame.addItem(spacerItem, 0, 2, 1, 1)
         self.label_title = QtWidgets.QLabel(self.frame)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Preferred, QtWidgets.QSizePolicy.Policy.Minimum)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label_title.sizePolicy().hasHeightForWidth())
@@ -43,6 +43,7 @@ class Ui_Form(object):
         font.setBold(False)
         font.setWeight(50)
         self.label_title.setFont(font)
+        self.label_title.setWordWrap(True)
         self.label_title.setTextInteractionFlags(QtCore.Qt.TextInteractionFlag.LinksAccessibleByMouse|QtCore.Qt.TextInteractionFlag.TextSelectableByMouse)
         self.label_title.setObjectName("label_title")
         self.gridLayout_frame.addWidget(self.label_title, 0, 1, 1, 1)
diff --git a/gotify_tray/gui/designs/widget_message.ui b/gotify_tray/gui/designs/widget_message.ui
index 7891597..74d453b 100644
--- a/gotify_tray/gui/designs/widget_message.ui
+++ b/gotify_tray/gui/designs/widget_message.ui
@@ -62,6 +62,9 @@
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Maximum</enum>
+        </property>
         <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
@@ -73,7 +76,7 @@
       <item row="0" column="1">
        <widget class="QLabel" name="label_title">
         <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+         <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
@@ -88,6 +91,9 @@
         <property name="text">
          <string>Title</string>
         </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
         <property name="textInteractionFlags">
          <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
         </property>
diff --git a/gotify_tray/gui/widgets/MessageWidget.py b/gotify_tray/gui/widgets/MessageWidget.py
index 07c8b36..8e737f9 100644
--- a/gotify_tray/gui/widgets/MessageWidget.py
+++ b/gotify_tray/gui/widgets/MessageWidget.py
@@ -62,7 +62,7 @@ class MessageWidget(QtWidgets.QWidget, Ui_Form):
 
         # Set MessagesModelItem's size hint based on the size of this widget
         self.gridLayout_frame.setContentsMargins(5, 5, 5, 5)
-        self.gridLayout.setContentsMargins(5, 5, 5, 5)
+        self.gridLayout.setContentsMargins(4, 5, 4, 0)
         self.adjustSize()
         size_hint = self.message_item.sizeHint()
         self.message_item.setSizeHint(QtCore.QSize(size_hint.width(), self.height()))