diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml
index 4b3019170..f878a89b8 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-02"/>
+    <release version="4.0.4" date="2021-11-03"/>
   </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 b9e5920b7..424a5e957 100644
--- a/src/librssguard/core/messagesmodel.cpp
+++ b/src/librssguard/core/messagesmodel.cpp
@@ -299,7 +299,7 @@ QVariant MessagesModel::data(const QModelIndex& idx, int role) const {
       }
       else if (index_column == MSG_DB_FEED_TITLE_INDEX) {
         // Trim feed title.
-        return data(idx, Qt::ItemDataRole::EditRole).toString().trimmed();
+        return data(idx, Qt::ItemDataRole::EditRole).toString().simplified();
       }
       else if (index_column == MSG_DB_CONTENTS_INDEX) {
         // Do not display full contents here.
diff --git a/src/librssguard/gui/dialogs/formmain.cpp b/src/librssguard/gui/dialogs/formmain.cpp
index db0eb48f0..57a0f698b 100644
--- a/src/librssguard/gui/dialogs/formmain.cpp
+++ b/src/librssguard/gui/dialogs/formmain.cpp
@@ -406,7 +406,7 @@ void FormMain::onFeedUpdatesStarted() {
 
 void FormMain::onFeedUpdatesProgress(const Feed* feed, int current, int total) {
   statusBar()->showProgressFeeds(int((current * 100.0) / total),
-                                 feed->title());
+                                 feed->sanitizedTitle());
 }
 
 void FormMain::updateMessageButtonsAvailability() {
diff --git a/src/librssguard/services/abstract/rootitem.cpp b/src/librssguard/services/abstract/rootitem.cpp
index 2f078f26b..dcc80dfa0 100644
--- a/src/librssguard/services/abstract/rootitem.cpp
+++ b/src/librssguard/services/abstract/rootitem.cpp
@@ -164,7 +164,7 @@ QVariant RootItem::data(int column, int role) const {
 
     case Qt::ItemDataRole::DisplayRole:
       if (column == FDS_MODEL_TITLE_INDEX) {
-        return m_title.trimmed();
+        return sanitizedTitle();
       }
       else if (column == FDS_MODEL_COUNTS_INDEX) {
         int count_unread = countOfUnreadMessages();
@@ -500,6 +500,10 @@ QString RootItem::title() const {
   return m_title;
 }
 
+QString RootItem::sanitizedTitle() const {
+  return m_title.simplified();
+}
+
 void RootItem::setTitle(const QString& title) {
   m_title = title;
 }
diff --git a/src/librssguard/services/abstract/rootitem.h b/src/librssguard/services/abstract/rootitem.h
index 2005fdd4a..a0b7f27cf 100644
--- a/src/librssguard/services/abstract/rootitem.h
+++ b/src/librssguard/services/abstract/rootitem.h
@@ -171,6 +171,7 @@ class RSSGUARD_DLLSPEC RootItem : public QObject {
 
     // Each item has its title.
     QString title() const;
+    QString sanitizedTitle() const;
     void setTitle(const QString& title);
 
     // This should be in UTC and should be converted to localtime when needed.
diff --git a/src/librssguard/services/standard/gui/formstandardfeeddetails.cpp b/src/librssguard/services/standard/gui/formstandardfeeddetails.cpp
index 52a1c686a..ce28a854c 100644
--- a/src/librssguard/services/standard/gui/formstandardfeeddetails.cpp
+++ b/src/librssguard/services/standard/gui/formstandardfeeddetails.cpp
@@ -70,7 +70,7 @@ void FormStandardFeedDetails::apply() {
     static_cast<StandardFeed::Type>(m_standardFeedDetails->m_ui.m_cmbType->itemData(m_standardFeedDetails->m_ui.m_cmbType->currentIndex()).value<int>());
 
   // Setup data for new_feed.
-  std_feed->setTitle(m_standardFeedDetails->m_ui.m_txtTitle->lineEdit()->text());
+  std_feed->setTitle(m_standardFeedDetails->m_ui.m_txtTitle->lineEdit()->text().simplified());
   std_feed->setCreationDate(QDateTime::currentDateTime());
   std_feed->setDescription(m_standardFeedDetails->m_ui.m_txtDescription->lineEdit()->text());
   std_feed->setIcon(m_standardFeedDetails->m_ui.m_btnIcon->icon());
diff --git a/src/librssguard/services/standard/gui/standardfeeddetails.cpp b/src/librssguard/services/standard/gui/standardfeeddetails.cpp
index 939023f4a..6e876b55f 100644
--- a/src/librssguard/services/standard/gui/standardfeeddetails.cpp
+++ b/src/librssguard/services/standard/gui/standardfeeddetails.cpp
@@ -166,7 +166,7 @@ void StandardFeedDetails::guessFeed(StandardFeed::SourceType source_type, const
 
     // Icon or whole feed was guessed.
     m_ui.m_btnIcon->setIcon(metadata->icon());
-    m_ui.m_txtTitle->lineEdit()->setText(metadata->title());
+    m_ui.m_txtTitle->lineEdit()->setText(metadata->sanitizedTitle());
     m_ui.m_txtDescription->lineEdit()->setText(metadata->description());
     m_ui.m_cmbType->setCurrentIndex(m_ui.m_cmbType->findData(QVariant::fromValue((int) metadata->type())));
     int encoding_index = m_ui.m_cmbEncoding->findText(metadata->encoding(), Qt::MatchFlag::MatchFixedString);