diff --git a/src/librssguard/core/messagesmodel.cpp b/src/librssguard/core/messagesmodel.cpp
index 75a7005e3..d457e50a5 100644
--- a/src/librssguard/core/messagesmodel.cpp
+++ b/src/librssguard/core/messagesmodel.cpp
@@ -352,7 +352,8 @@ QVariant MessagesModel::data(const QModelIndex& idx, int role) const {
           return data(idx, Qt::ItemDataRole::EditRole);
         }
         else {
-          return data(idx, Qt::ItemDataRole::DisplayRole);
+          return TextFactory::shorten(data(idx, Qt::ItemDataRole::DisplayRole).toString(),
+                                      TEXT_TOOLTIP_LIMIT);
         }
       }
     }
diff --git a/src/librssguard/definitions/definitions.h b/src/librssguard/definitions/definitions.h
index 45605aa06..149300c34 100644
--- a/src/librssguard/definitions/definitions.h
+++ b/src/librssguard/definitions/definitions.h
@@ -56,6 +56,7 @@
 #define URL_REGEXP "^(http|https|feed|ftp):\\/\\/[\\w\\-_]+(\\.[\\w\\-_]+)+([\\w\\-\\.,@?^=%&:/~\\+#]*[\\w\\-\\@?^=%&/~\\+#])?$"
 #define SCRIPT_SOURCE_TYPE_REGEXP             "^.+#.*$"
 #define TEXT_TITLE_LIMIT                      30
+#define TEXT_TOOLTIP_LIMIT                    50
 #define LOWER_TITLE_ROLE                      64
 #define RESELECT_MESSAGE_THRESSHOLD           500
 #define ICON_SIZE_SETTINGS                    16