diff --git a/src/librssguard/core/feeddownloader.cpp b/src/librssguard/core/feeddownloader.cpp
index 563f7a2f6..a560b726d 100644
--- a/src/librssguard/core/feeddownloader.cpp
+++ b/src/librssguard/core/feeddownloader.cpp
@@ -174,7 +174,7 @@ void FeedDownloader::updateOneFeed(Feed* feed) {
 
           if (filter.isNull()) {
             qCriticalNN << LOGSEC_FEEDDOWNLOADER
-                        << "Message filter was probably deleted, removing its pointer from list of filters.";
+                        << "Article filter was probably deleted, removing its pointer from list of filters.";
             feed_filters.removeAt(j--);
             continue;
           }
diff --git a/src/librssguard/gui/dialogs/formmessagefiltersmanager.ui b/src/librssguard/gui/dialogs/formmessagefiltersmanager.ui
index bc7b946ca..2a49c30ba 100644
--- a/src/librssguard/gui/dialogs/formmessagefiltersmanager.ui
+++ b/src/librssguard/gui/dialogs/formmessagefiltersmanager.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Message filters</string>
+   <string>Article filters</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -112,7 +112,7 @@
        <item row="1" column="0" colspan="2">
         <widget class="QGroupBox" name="m_gbDetails">
          <property name="title">
-          <string>Message filter details</string>
+          <string>Article filter details</string>
          </property>
          <layout class="QFormLayout" name="formLayout">
           <item row="0" column="0">
@@ -140,7 +140,7 @@
              </size>
             </property>
             <property name="placeholderText">
-             <string>Title of message filter</string>
+             <string>Title of article filter</string>
             </property>
            </widget>
           </item>
@@ -163,7 +163,7 @@
              </sizepolicy>
             </property>
             <property name="placeholderText">
-             <string>Your JavaScript-based message filtering logic</string>
+             <string>Your JavaScript-based article filtering logic</string>
             </property>
            </widget>
           </item>
diff --git a/src/librssguard/gui/settings/settingsfeedsmessages.ui b/src/librssguard/gui/settings/settingsfeedsmessages.ui
index 706d9b317..e111e8018 100644
--- a/src/librssguard/gui/settings/settingsfeedsmessages.ui
+++ b/src/librssguard/gui/settings/settingsfeedsmessages.ui
@@ -36,7 +36,7 @@
        <item row="0" column="0">
         <widget class="QCheckBox" name="m_checkUpdateAllFeedsOnStartup">
          <property name="text">
-          <string>Download messages for all feeds on application startup with initial delay of</string>
+          <string>Fetch articles for all feeds on application startup with initial delay of</string>
          </property>
         </widget>
        </item>
@@ -56,7 +56,7 @@
        <item row="1" column="0">
         <widget class="QCheckBox" name="m_checkAutoUpdate">
          <property name="text">
-          <string>Auto-download messages for all feeds every</string>
+          <string>Auto-fetch articles for all feeds every</string>
          </property>
         </widget>
        </item>
@@ -76,7 +76,7 @@
        <item row="2" column="0" colspan="2">
         <widget class="QCheckBox" name="m_checkAutoUpdateOnlyUnfocused">
          <property name="text">
-          <string>Only auto-download messages when application is unfocused</string>
+          <string>Only auto-fetch articles if application is unfocused</string>
          </property>
         </widget>
        </item>
@@ -164,7 +164,7 @@
        <item row="6" column="0">
         <widget class="QLabel" name="label_8">
          <property name="text">
-          <string>Message count format in feed list</string>
+          <string>Article count format in feed list</string>
          </property>
          <property name="buddy">
           <cstring>m_cmbCountsFeedList</cstring>
@@ -189,7 +189,7 @@
           </font>
          </property>
          <property name="text">
-          <string>Enter format for count of messages displayed next to each feed/category in feed list. Use &quot;%all&quot; and &quot;%unread&quot; strings which are placeholders for the actual count of all (or unread) messages.</string>
+          <string>Enter format for count of articles displayed next to each feed/category in feed list. Use &quot;%all&quot; and &quot;%unread&quot; strings which are placeholders for the actual count of all (or unread) articles.</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
@@ -202,14 +202,14 @@
        <item row="8" column="0" colspan="2">
         <widget class="QCheckBox" name="m_cbHideCountsIfNoUnread">
          <property name="text">
-          <string>Hide message counts if there are no unread messages</string>
+          <string>Hide article counts if there are no unread articles</string>
          </property>
         </widget>
        </item>
        <item row="9" column="0" colspan="2">
         <widget class="QCheckBox" name="m_checkShowTooltips">
          <property name="text">
-          <string>Display tooltips for feeds and messages</string>
+          <string>Display tooltips for feeds and articles</string>
          </property>
         </widget>
        </item>
diff --git a/src/librssguard/services/feedly/gui/feedlyaccountdetails.cpp b/src/librssguard/services/feedly/gui/feedlyaccountdetails.cpp
index b74fbb020..b0263be58 100755
--- a/src/librssguard/services/feedly/gui/feedlyaccountdetails.cpp
+++ b/src/librssguard/services/feedly/gui/feedlyaccountdetails.cpp
@@ -42,7 +42,7 @@ FeedlyAccountDetails::FeedlyAccountDetails(QWidget* parent) : QWidget(parent), m
 #endif
 
   m_ui.m_lblLimitMessagesInfo->setText(tr("Beware of downloading too many articles, because "
-                                          "Feedly permanently caches ALL articles of the feed forever so you might "
+                                          "Feedly permanently caches ALL articles of the feed, so you might "
                                           "end up with thousands of articles which you will never read anyway."));
 
   GuiUtilities::setLabelAsNotice(*m_ui.m_lblInfo, true);