diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml
index 6519786d8..6151e9995 100644
--- a/resources/desktop/com.github.rssguard.appdata.xml
+++ b/resources/desktop/com.github.rssguard.appdata.xml
@@ -26,7 +26,7 @@
   <url type="donation">https://github.com/sponsors/martinrotter</url>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="4.0.4" date="2021-11-19"/>
+    <release version="4.0.4" date="2021-11-22"/>
   </releases>
   <content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">none</content_attribute>
diff --git a/src/librssguard/core/messagesmodel.cpp b/src/librssguard/core/messagesmodel.cpp
index 0aaad9d2d..c5c5f6c51 100644
--- a/src/librssguard/core/messagesmodel.cpp
+++ b/src/librssguard/core/messagesmodel.cpp
@@ -351,10 +351,13 @@ QVariant MessagesModel::data(const QModelIndex& idx, int role) const {
         if (idx.column() == MSG_DB_SCORE_INDEX) {
           return data(idx, Qt::ItemDataRole::EditRole);
         }
-        else {
+        else if (idx.column() == MSG_DB_URL_INDEX) {
           return TextFactory::shorten(data(idx, Qt::ItemDataRole::DisplayRole).toString(),
                                       TEXT_TOOLTIP_LIMIT);
         }
+        else {
+          return data(idx, Qt::ItemDataRole::DisplayRole);
+        }
       }
     }
 
diff --git a/src/librssguard/gui/tabwidget.cpp b/src/librssguard/gui/tabwidget.cpp
index 52ec028e8..4b58becec 100644
--- a/src/librssguard/gui/tabwidget.cpp
+++ b/src/librssguard/gui/tabwidget.cpp
@@ -288,7 +288,7 @@ void TabWidget::gotoPreviousTab() {
 }
 
 void TabWidget::indentTabText(int index) {
-#if defined(Q_OS_MACOSOS)
+#if defined(Q_OS_MACOS)
   if (tabBar()->tabType(index) != TabBar::FeedReader && !tabIcon(index).isNull()) {
     // We have closable tab with some icon, fix the title.
     const QString text = tabText(index);
@@ -311,7 +311,7 @@ void TabWidget::removeTab(int index, bool clear_from_memory) {
 }
 
 int TabWidget::addTab(TabContent* widget, const QIcon& icon, const QString& label, TabBar::TabType type) {
-  const int index = QTabWidget::addTab(widget, icon, label);
+  const int index = QTabWidget::addTab(widget, icon, TextFactory::shorten(label));
 
   tabBar()->setTabType(index, type);
   indentTabText(index);
@@ -319,7 +319,7 @@ int TabWidget::addTab(TabContent* widget, const QIcon& icon, const QString& labe
 }
 
 int TabWidget::addTab(TabContent* widget, const QString& label, TabBar::TabType type) {
-  const int index = QTabWidget::addTab(widget, label);
+  const int index = QTabWidget::addTab(widget, TextFactory::shorten(label));
 
   tabBar()->setTabType(index, type);
   indentTabText(index);
@@ -349,7 +349,7 @@ void TabWidget::changeIcon(int index, const QIcon& new_icon) {
 
 void TabWidget::changeTitle(int index, const QString& new_title) {
   setTabText(index, TextFactory::shorten(new_title));
-  setTabToolTip(index, new_title);
+  setTabToolTip(index, TextFactory::shorten(new_title));
   indentTabText(index);
 }