diff --git a/src/librssguard/core/messagesmodel.cpp b/src/librssguard/core/messagesmodel.cpp
index e246b3ee0..a2646fb12 100644
--- a/src/librssguard/core/messagesmodel.cpp
+++ b/src/librssguard/core/messagesmodel.cpp
@@ -138,8 +138,8 @@ void MessagesModel::loadMessages(RootItem* item) {
                   << "Loading of messages from item '"
                   << item->title() << "' failed.";
       qApp->showGuiMessage(Notification::Event::GeneralEvent,
-                           tr("Loading of messages from item '%1' failed.").arg(item->title()),
-                           tr("Loading of messages failed, maybe messages could not be downloaded."),
+                           tr("Loading of articles from item '%1' failed.").arg(item->title()),
+                           tr("Loading of articles failed, maybe messages could not be downloaded."),
                            QSystemTrayIcon::MessageIcon::Critical,
                            true);
     }
@@ -246,24 +246,24 @@ void MessagesModel::setupHeaderData() {
     /*: Tooltip for indication of presence of enclosures.*/ tr("Has enclosures");
 
   m_tooltipData
-    << tr("ID of the message.")
-    << tr("Is message read?")
-    << tr("Is message important?")
-    << tr("Is message deleted?")
-    << tr("Is message permanently deleted from recycle bin?")
-    << tr("ID of feed which this message belongs to.")
-    << tr("Title of the message.")
-    << tr("Url of the message.")
-    << tr("Author of the message.")
-    << tr("Creation date of the message.")
-    << tr("Contents of the message.")
+    << tr("ID of the article.")
+    << tr("Is article read?")
+    << tr("Is article important?")
+    << tr("Is article deleted?")
+    << tr("Is article permanently deleted from recycle bin?")
+    << tr("ID of feed which this article belongs to.")
+    << tr("Title of the article.")
+    << tr("Url of the article.")
+    << tr("Author of the article.")
+    << tr("Creation date of the article.")
+    << tr("Contents of the article.")
     << tr("List of attachments.")
-    << tr("Score of the message.")
-    << tr("Account ID of the message.")
-    << tr("Custom ID of the message")
-    << tr("Custom hash of the message.")
-    << tr("Custom ID of feed of the message.")
-    << tr("Indication of enclosures presence within the message.");
+    << tr("Score of the article.")
+    << tr("Account ID of the article.")
+    << tr("Custom ID of the article")
+    << tr("Custom hash of the article.")
+    << tr("Custom ID of feed of the article.")
+    << tr("Indication of enclosures presence within the article.");
 }
 
 Qt::ItemFlags MessagesModel::flags(const QModelIndex& index) const {
diff --git a/src/librssguard/database/databasecleaner.cpp b/src/librssguard/database/databasecleaner.cpp
index 6ca3372ee..81df6b2c2 100644
--- a/src/librssguard/database/databasecleaner.cpp
+++ b/src/librssguard/database/databasecleaner.cpp
@@ -22,12 +22,12 @@ void DatabaseCleaner::purgeDatabaseData(const CleanerOrders& which_data) {
 
   if (which_data.m_removeReadMessages) {
     progress += difference;
-    emit purgeProgress(progress, tr("Removing read messages..."));
+    emit purgeProgress(progress, tr("Removing read articles..."));
 
     // Remove read messages.
     result &= purgeReadMessages(database);
     progress += difference;
-    emit purgeProgress(progress, tr("Read messages purged..."));
+    emit purgeProgress(progress, tr("Read articles purged..."));
   }
 
   if (which_data.m_removeRecycleBin) {
@@ -42,22 +42,22 @@ void DatabaseCleaner::purgeDatabaseData(const CleanerOrders& which_data) {
 
   if (which_data.m_removeOldMessages) {
     progress += difference;
-    emit purgeProgress(progress, tr("Removing old messages..."));
+    emit purgeProgress(progress, tr("Removing old articles..."));
 
     // Remove old messages.
     result &= purgeOldMessages(database, which_data.m_barrierForRemovingOldMessagesInDays);
     progress += difference;
-    emit purgeProgress(progress, tr("Old messages purged..."));
+    emit purgeProgress(progress, tr("Old articles purged..."));
   }
 
   if (which_data.m_removeStarredMessages) {
     progress += difference;
-    emit purgeProgress(progress, tr("Removing starred messages..."));
+    emit purgeProgress(progress, tr("Removing starred articles..."));
 
     // Remove old messages.
     result &= purgeStarredMessages(database);
     progress += difference;
-    emit purgeProgress(progress, tr("Starred messages purged..."));
+    emit purgeProgress(progress, tr("Starred articles purged..."));
   }
 
   result &= DatabaseQueries::purgeLeftoverLabelAssignments(database);
diff --git a/src/librssguard/database/databasequeries.cpp b/src/librssguard/database/databasequeries.cpp
index 74dcd6fdf..f2f84b9c3 100755
--- a/src/librssguard/database/databasequeries.cpp
+++ b/src/librssguard/database/databasequeries.cpp
@@ -1920,7 +1920,7 @@ bool DatabaseQueries::deleteCategory(const QSqlDatabase& db, int id) {
 MessageFilter* DatabaseQueries::addMessageFilter(const QSqlDatabase& db, const QString& title,
                                                  const QString& script) {
   if (!db.driver()->hasFeature(QSqlDriver::DriverFeature::LastInsertId)) {
-    throw ApplicationException(QObject::tr("Cannot insert message filter, because current database cannot return last inserted row ID."));
+    throw ApplicationException(QObject::tr("Cannot insert article filter, because current database cannot return last inserted row ID."));
   }
 
   QSqlQuery q(db);
diff --git a/src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp b/src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp
index 056ab59a5..805a4e28e 100644
--- a/src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp
+++ b/src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp
@@ -138,7 +138,7 @@ void FormMessageFiltersManager::showMessageContextMenu(const QPoint& pos) {
   if (msg != nullptr) {
     QMenu menu(tr("Context menu"), m_ui.m_treeExistingMessages);
 
-    menu.addAction(tr("Filter messages like this"), this, [=]() {
+    menu.addAction(tr("Filter articles like this"), this, [=]() {
       filterMessagesLikeThis(*msg);
     });
     menu.exec(m_ui.m_treeExistingMessages->mapToGlobal(pos));
@@ -169,7 +169,7 @@ void FormMessageFiltersManager::loadFilters() {
 void FormMessageFiltersManager::addNewFilter(const QString& filter_script) {
   try {
     auto* fltr = m_reader->addMessageFilter(
-      tr("New message filter"),
+      tr("New article filter"),
       filter_script.isEmpty()
                    ? QSL("function filterMessage() { return MessageObject.Accept; }")
                    : filter_script);
@@ -237,7 +237,7 @@ void FormMessageFiltersManager::testFilter() {
   }
   catch (const FilteringException& ex) {
     m_ui.m_txtErrors->setTextColor(Qt::GlobalColor::red);
-    m_ui.m_txtErrors->insertPlainText(tr("EXISTING messages filtering error: '%1'.\n").arg(ex.message()));
+    m_ui.m_txtErrors->insertPlainText(tr("EXISTING articles filtering error: '%1'.\n").arg(ex.message()));
 
     // See output.
     m_ui.m_twMessages->setCurrentIndex(2);
@@ -253,11 +253,11 @@ void FormMessageFiltersManager::testFilter() {
 
     m_ui.m_txtErrors->setTextColor(decision == MessageObject::FilteringAction::Accept ? Qt::GlobalColor::darkGreen : Qt::GlobalColor::red);
 
-    QString answer = tr("Message will be %1.\n\n").arg(decision == MessageObject::FilteringAction::Accept
+    QString answer = tr("Article will be %1.\n\n").arg(decision == MessageObject::FilteringAction::Accept
                                                        ? tr("ACCEPTED")
                                                        : tr("REJECTED"));
 
-    answer += tr("Output (modified) message is:\n"
+    answer += tr("Output (modified) article is:\n"
                  "  Title = '%1'\n"
                  "  URL = '%2'\n"
                  "  Author = '%3'\n"
@@ -275,7 +275,7 @@ void FormMessageFiltersManager::testFilter() {
   }
   catch (const FilteringException& ex) {
     m_ui.m_txtErrors->setTextColor(Qt::GlobalColor::red);
-    m_ui.m_txtErrors->insertPlainText(tr("SAMPLE message filtering error: '%1'.\n").arg(ex.message()));
+    m_ui.m_txtErrors->insertPlainText(tr("SAMPLE article filtering error: '%1'.\n").arg(ex.message()));
 
     // See output.
     m_ui.m_twMessages->setCurrentIndex(2);
diff --git a/src/librssguard/gui/feedmessageviewer.cpp b/src/librssguard/gui/feedmessageviewer.cpp
index 6b6f54336..477a7caa7 100644
--- a/src/librssguard/gui/feedmessageviewer.cpp
+++ b/src/librssguard/gui/feedmessageviewer.cpp
@@ -45,7 +45,7 @@
 #include <QWidgetAction>
 
 FeedMessageViewer::FeedMessageViewer(QWidget* parent) : TabContent(parent), m_toolBarsEnabled(true), m_listHeadersEnabled(true),
-  m_toolBarFeeds(new FeedsToolBar(tr("Toolbar for feeds"), this)), m_toolBarMessages(new MessagesToolBar(tr("Toolbar for messages"), this)),
+  m_toolBarFeeds(new FeedsToolBar(tr("Toolbar for feeds"), this)), m_toolBarMessages(new MessagesToolBar(tr("Toolbar for articles"), this)),
   m_messagesView(new MessagesView(this)), m_feedsView(new FeedsView(this)),
   m_messagesBrowser(new MessagePreviewer(false, this)) {
   initialize();
diff --git a/src/librssguard/gui/feedsview.cpp b/src/librssguard/gui/feedsview.cpp
index b77a049c6..ca44c0083 100755
--- a/src/librssguard/gui/feedsview.cpp
+++ b/src/librssguard/gui/feedsview.cpp
@@ -654,7 +654,7 @@ QMenu* FeedsView::initializeContextMenuFeeds(RootItem* clicked_item) {
 
 QMenu* FeedsView::initializeContextMenuImportant(RootItem* clicked_item) {
   if (m_contextMenuImportant == nullptr) {
-    m_contextMenuImportant = new QMenu(tr("Context menu for important messages"), this);
+    m_contextMenuImportant = new QMenu(tr("Context menu for important articles"), this);
   }
   else {
     m_contextMenuImportant->clear();
diff --git a/src/librssguard/gui/messagepreviewer.cpp b/src/librssguard/gui/messagepreviewer.cpp
index 2eb7090ff..b2bcb9769 100755
--- a/src/librssguard/gui/messagepreviewer.cpp
+++ b/src/librssguard/gui/messagepreviewer.cpp
@@ -31,15 +31,15 @@
 void MessagePreviewer::createConnections() {
   installEventFilter(this);
 
-  connect(m_actionMarkRead = m_toolBar->addAction(qApp->icons()->fromTheme("mail-mark-read"), tr("Mark message as read")),
+  connect(m_actionMarkRead = m_toolBar->addAction(qApp->icons()->fromTheme("mail-mark-read"), tr("Mark article read")),
           &QAction::triggered,
           this,
           &MessagePreviewer::markMessageAsRead);
-  connect(m_actionMarkUnread = m_toolBar->addAction(qApp->icons()->fromTheme("mail-mark-unread"), tr("Mark message as unread")),
+  connect(m_actionMarkUnread = m_toolBar->addAction(qApp->icons()->fromTheme("mail-mark-unread"), tr("Mark article unread")),
           &QAction::triggered,
           this,
           &MessagePreviewer::markMessageAsUnread);
-  connect(m_actionSwitchImportance = m_toolBar->addAction(qApp->icons()->fromTheme("mail-mark-important"), tr("Switch message importance")),
+  connect(m_actionSwitchImportance = m_toolBar->addAction(qApp->icons()->fromTheme("mail-mark-important"), tr("Switch article importance")),
           &QAction::triggered,
           this,
           &MessagePreviewer::switchMessageImportance);
diff --git a/src/librssguard/gui/messagesview.cpp b/src/librssguard/gui/messagesview.cpp
index 939be4427..3e6c39d2c 100644
--- a/src/librssguard/gui/messagesview.cpp
+++ b/src/librssguard/gui/messagesview.cpp
@@ -191,7 +191,7 @@ void MessagesView::contextMenuEvent(QContextMenuEvent* event) {
 
 void MessagesView::initializeContextMenu() {
   if (m_contextMenu == nullptr) {
-    m_contextMenu = new QMenu(tr("Context menu for messages"), this);
+    m_contextMenu = new QMenu(tr("Context menu for articles"), this);
   }
 
   m_contextMenu->clear();
diff --git a/src/librssguard/gui/reusable/messagecountspinbox.cpp b/src/librssguard/gui/reusable/messagecountspinbox.cpp
index 41a0ea387..984a02df8 100755
--- a/src/librssguard/gui/reusable/messagecountspinbox.cpp
+++ b/src/librssguard/gui/reusable/messagecountspinbox.cpp
@@ -12,10 +12,10 @@ MessageCountSpinBox::MessageCountSpinBox(QWidget* parent) : QSpinBox(parent) {
       setSuffix(QSL(" ") + tr("= unlimited"));
     }
     else if (value == 1) {
-      setSuffix(QSL(" ") + tr("message"));
+      setSuffix(QSL(" ") + tr("article"));
     }
     else {
-      setSuffix(QSL(" ") + tr("messages"));
+      setSuffix(QSL(" ") + tr("articles"));
     }
   });
 
diff --git a/src/librssguard/gui/tabwidget.cpp b/src/librssguard/gui/tabwidget.cpp
index ef6195ac3..43db3fd3c 100644
--- a/src/librssguard/gui/tabwidget.cpp
+++ b/src/librssguard/gui/tabwidget.cpp
@@ -134,7 +134,7 @@ void TabWidget::initializeTabs() {
   m_feedMessageViewer = new FeedMessageViewer(this);
   const int index_of_browser = addTab(m_feedMessageViewer, QIcon(), tr("Feeds"), TabBar::TabType::FeedReader);
 
-  setTabToolTip(index_of_browser, tr("Browse your feeds and messages"));
+  setTabToolTip(index_of_browser, tr("Browse your feeds and articles"));
 }
 
 void TabWidget::setupIcons() {
diff --git a/src/librssguard/gui/toolbars/messagestoolbar.cpp b/src/librssguard/gui/toolbars/messagestoolbar.cpp
index 21767bf2b..673e78a80 100755
--- a/src/librssguard/gui/toolbars/messagestoolbar.cpp
+++ b/src/librssguard/gui/toolbars/messagestoolbar.cpp
@@ -103,28 +103,28 @@ void MessagesToolBar::handleMessageHighlighterChange(QAction* action) {
 void MessagesToolBar::initializeSearchBox() {
   m_txtSearchMessages = new BaseLineEdit(this);
   m_txtSearchMessages->setSizePolicy(QSizePolicy::Policy::Expanding, m_txtSearchMessages->sizePolicy().verticalPolicy());
-  m_txtSearchMessages->setPlaceholderText(tr("Search messages"));
+  m_txtSearchMessages->setPlaceholderText(tr("Search articles"));
 
   // Setup wrapping action for search box.
   m_actionSearchMessages = new QWidgetAction(this);
   m_actionSearchMessages->setDefaultWidget(m_txtSearchMessages);
   m_actionSearchMessages->setIcon(qApp->icons()->fromTheme(QSL("system-search")));
   m_actionSearchMessages->setProperty("type", SEARCH_BOX_ACTION_NAME);
-  m_actionSearchMessages->setProperty("name", tr("Message search box"));
+  m_actionSearchMessages->setProperty("name", tr("Article search box"));
 
   connect(m_txtSearchMessages, &BaseLineEdit::textChanged, this, &MessagesToolBar::messageSearchPatternChanged);
 }
 
 void MessagesToolBar::initializeHighlighter() {
-  m_menuMessageHighlighter = new QMenu(tr("Menu for highlighting messages"), this);
+  m_menuMessageHighlighter = new QMenu(tr("Menu for highlighting articles"), this);
   m_menuMessageHighlighter->addAction(qApp->icons()->fromTheme(QSL("mail-mark-read")),
                                       tr("No extra highlighting"))->setData(QVariant::fromValue(MessagesModel::MessageHighlighter::NoHighlighting));
   m_menuMessageHighlighter->addAction(qApp->icons()->fromTheme(QSL("mail-mark-unread")),
-                                      tr("Highlight unread messages"))->setData(QVariant::fromValue(MessagesModel::MessageHighlighter::HighlightUnread));
+                                      tr("Highlight unread articles"))->setData(QVariant::fromValue(MessagesModel::MessageHighlighter::HighlightUnread));
   m_menuMessageHighlighter->addAction(qApp->icons()->fromTheme(QSL("mail-mark-important")),
-                                      tr("Highlight important messages"))->setData(QVariant::fromValue(MessagesModel::MessageHighlighter::HighlightImportant));
+                                      tr("Highlight important articles"))->setData(QVariant::fromValue(MessagesModel::MessageHighlighter::HighlightImportant));
   m_btnMessageHighlighter = new QToolButton(this);
-  m_btnMessageHighlighter->setToolTip(tr("Display all messages"));
+  m_btnMessageHighlighter->setToolTip(tr("Display all articles"));
   m_btnMessageHighlighter->setMenu(m_menuMessageHighlighter);
   m_btnMessageHighlighter->setPopupMode(QToolButton::ToolButtonPopupMode::MenuButtonPopup);
   m_btnMessageHighlighter->setIcon(qApp->icons()->fromTheme(QSL("mail-mark-read")));
@@ -132,7 +132,7 @@ void MessagesToolBar::initializeHighlighter() {
   m_actionMessageHighlighter->setDefaultWidget(m_btnMessageHighlighter);
   m_actionMessageHighlighter->setIcon(m_btnMessageHighlighter->icon());
   m_actionMessageHighlighter->setProperty("type", HIGHLIGHTER_ACTION_NAME);
-  m_actionMessageHighlighter->setProperty("name", tr("Message highlighter"));
+  m_actionMessageHighlighter->setProperty("name", tr("Article highlighter"));
 
   connect(m_menuMessageHighlighter, &QMenu::triggered, this, &MessagesToolBar::handleMessageHighlighterChange);
 }
diff --git a/src/librssguard/services/abstract/feed.cpp b/src/librssguard/services/abstract/feed.cpp
index ebbf86848..23c47f6a4 100755
--- a/src/librssguard/services/abstract/feed.cpp
+++ b/src/librssguard/services/abstract/feed.cpp
@@ -263,24 +263,24 @@ QString Feed::getAutoUpdateStatusDescription() const {
     case AutoUpdateType::DontAutoUpdate:
 
       //: Describes feed auto-update status.
-      auto_update_string = tr("does not use auto-downloading of messages");
+      auto_update_string = tr("does not use auto-fetching of articles");
       break;
 
     case AutoUpdateType::DefaultAutoUpdate:
 
       //: Describes feed auto-update status.
       auto_update_string = qApp->feedReader()->autoUpdateEnabled()
-              ? tr("uses global settings (%n minute(s) to next auto-download of messages)",
+              ? tr("uses global settings (%n minute(s) to next auto-fetch of articles)",
                    nullptr,
                    qApp->feedReader()->autoUpdateRemainingInterval())
-              : tr("uses global settings (global auto-downloading of messages is disabled)");
+              : tr("uses global settings (global auto-fetching of articles is disabled)");
       break;
 
     case AutoUpdateType::SpecificAutoUpdate:
     default:
 
       //: Describes feed auto-update status.
-      auto_update_string = tr("uses specific settings (%n minute(s) to next auto-downloading of new messages)", nullptr, autoUpdateRemainingInterval());
+      auto_update_string = tr("uses specific settings (%n minute(s) to next auto-fetching of new articles)", nullptr, autoUpdateRemainingInterval());
       break;
   }
 
@@ -293,7 +293,7 @@ QString Feed::getStatusDescription() const {
       return tr("no errors");
 
     case Status::NewMessages:
-      return tr("has new messages");
+      return tr("has new articles");
 
     case Status::AuthError:
       return tr("authentication error");
diff --git a/src/librssguard/services/abstract/gui/formfeeddetails.cpp b/src/librssguard/services/abstract/gui/formfeeddetails.cpp
index 7bdc8d21f..d0d0945bf 100644
--- a/src/librssguard/services/abstract/gui/formfeeddetails.cpp
+++ b/src/librssguard/services/abstract/gui/formfeeddetails.cpp
@@ -112,10 +112,10 @@ void FormFeedDetails::initialize() {
 
   // Setup auto-update options.
   m_ui->m_spinAutoUpdateInterval->setValue(DEFAULT_AUTO_UPDATE_INTERVAL);
-  m_ui->m_cmbAutoUpdateType->addItem(tr("Download messages using global interval"),
+  m_ui->m_cmbAutoUpdateType->addItem(tr("Fetch articles using global interval"),
                                      QVariant::fromValue(int(Feed::AutoUpdateType::DefaultAutoUpdate)));
-  m_ui->m_cmbAutoUpdateType->addItem(tr("Download messages every"),
+  m_ui->m_cmbAutoUpdateType->addItem(tr("Fetch articles every"),
                                      QVariant::fromValue(int(Feed::AutoUpdateType::SpecificAutoUpdate)));
-  m_ui->m_cmbAutoUpdateType->addItem(tr("Do not download messages at all"),
+  m_ui->m_cmbAutoUpdateType->addItem(tr("Do not fetch articles at all"),
                                      QVariant::fromValue(int(Feed::AutoUpdateType::DontAutoUpdate)));
 }
diff --git a/src/librssguard/services/abstract/recyclebin.cpp b/src/librssguard/services/abstract/recyclebin.cpp
index 63abe375e..90703f708 100644
--- a/src/librssguard/services/abstract/recyclebin.cpp
+++ b/src/librssguard/services/abstract/recyclebin.cpp
@@ -17,11 +17,11 @@ RecycleBin::RecycleBin(RootItem* parent_item) : RootItem(parent_item), m_totalCo
   setId(ID_RECYCLE_BIN);
   setIcon(qApp->icons()->fromTheme(QSL("user-trash")));
   setTitle(tr("Recycle bin"));
-  setDescription(tr("Recycle bin contains all deleted messages from all feeds."));
+  setDescription(tr("Recycle bin contains all deleted articles from all feeds."));
 }
 
 QString RecycleBin::additionalTooltip() const {
-  return tr("%n deleted message(s).", nullptr, countOfAllMessages());
+  return tr("%n deleted article(s).", nullptr, countOfAllMessages());
 }
 
 int RecycleBin::countOfUnreadMessages() const {
diff --git a/src/librssguard/services/abstract/rootitem.cpp b/src/librssguard/services/abstract/rootitem.cpp
index 7e7785bda..a2c9fd3e4 100644
--- a/src/librssguard/services/abstract/rootitem.cpp
+++ b/src/librssguard/services/abstract/rootitem.cpp
@@ -142,7 +142,7 @@ QVariant RootItem::data(int column, int role) const {
       }
       else if (column == FDS_MODEL_COUNTS_INDEX) {
         //: Tooltip for "unread" column of feed list.
-        return tr("%n unread message(s).", nullptr, countOfUnreadMessages());
+        return tr("%n unread article(s).", nullptr, countOfUnreadMessages());
       }
       else {
         return QVariant();
diff --git a/src/librssguard/services/abstract/serviceroot.cpp b/src/librssguard/services/abstract/serviceroot.cpp
index 66f22c098..58f7ca895 100644
--- a/src/librssguard/services/abstract/serviceroot.cpp
+++ b/src/librssguard/services/abstract/serviceroot.cpp
@@ -94,7 +94,7 @@ QList<QAction*> ServiceRoot::serviceMenu() {
       auto* cache = toCache();
 
       if (cache != nullptr) {
-        auto* act_sync_cache = new QAction(qApp->icons()->fromTheme(QSL("view-refresh")), tr("Synchronize message cache"), this);
+        auto* act_sync_cache = new QAction(qApp->icons()->fromTheme(QSL("view-refresh")), tr("Synchronize article cache"), this);
 
         connect(act_sync_cache, &QAction::triggered, this, [cache]() {
           cache->saveAllCachedData(false);
diff --git a/src/librssguard/services/feedly/gui/feedlyaccountdetails.cpp b/src/librssguard/services/feedly/gui/feedlyaccountdetails.cpp
index 61a4d67b4..fcf43acc9 100755
--- a/src/librssguard/services/feedly/gui/feedlyaccountdetails.cpp
+++ b/src/librssguard/services/feedly/gui/feedlyaccountdetails.cpp
@@ -41,9 +41,9 @@ FeedlyAccountDetails::FeedlyAccountDetails(QWidget* parent) : QWidget(parent), m
                              "each day.").arg(APP_NAME));
 #endif
 
-  m_ui.m_lblLimitMessagesInfo->setText(tr("Be very careful about downloading too many messages, because "
-                                          "Feedly automagically caches ALL messages of a feed forever so you might "
-                                          "end with thousands of messages you will never read anyway."));
+  m_ui.m_lblLimitMessagesInfo->setText(tr("Be very careful about downloading too many articles, because "
+                                          "Feedly automagically caches ALL articles of a feed forever so you might "
+                                          "end with thousands of articles you will never read anyway."));
 
   GuiUtilities::setLabelAsNotice(*m_ui.m_lblInfo, true);
   GuiUtilities::setLabelAsNotice(*m_ui.m_lblLimitMessagesInfo, true);
diff --git a/src/librssguard/services/greader/gui/greaderaccountdetails.cpp b/src/librssguard/services/greader/gui/greaderaccountdetails.cpp
index 53a15aa38..69328ab21 100755
--- a/src/librssguard/services/greader/gui/greaderaccountdetails.cpp
+++ b/src/librssguard/services/greader/gui/greaderaccountdetails.cpp
@@ -29,10 +29,10 @@ GreaderAccountDetails::GreaderAccountDetails(QWidget* parent) : QWidget(parent)
   m_ui.m_lblTestResult->setStatus(WidgetWithStatus::StatusType::Information,
                                   tr("No test done yet."),
                                   tr("Here, results of connection test are shown."));
-  m_ui.m_lblLimitMessages->setText(tr("Limiting number of downloaded messages per feed makes updating of "
-                                      "feeds faster, but if your feed contains bigger number of messages "
-                                      "than specified limit, then some older messages might not be "
-                                      "downloaded during feed update."));
+  m_ui.m_lblLimitMessages->setText(tr("Limiting number of fetched articles per feed makes fetching of "
+                                      "articles faster, but if your feed contains bigger number of articles "
+                                      "than specified limit, then some older articles might not be "
+                                      "downloaded at all."));
 
   GuiUtilities::setLabelAsNotice(*m_ui.m_lblLimitMessages, true);
 
diff --git a/src/librssguard/services/owncloud/gui/owncloudaccountdetails.cpp b/src/librssguard/services/owncloud/gui/owncloudaccountdetails.cpp
index d540c38b4..2b10c4093 100755
--- a/src/librssguard/services/owncloud/gui/owncloudaccountdetails.cpp
+++ b/src/librssguard/services/owncloud/gui/owncloudaccountdetails.cpp
@@ -26,7 +26,7 @@ OwnCloudAccountDetails::OwnCloudAccountDetails(QWidget* parent) : QWidget(parent
       m_ui.m_spinLimitMessages->setSuffix(QSL(" ") + tr("= unlimited"));
     }
     else {
-      m_ui.m_spinLimitMessages->setSuffix(QSL(" ") + tr("messages"));
+      m_ui.m_spinLimitMessages->setSuffix(QSL(" ") + tr("articles"));
     }
   });