diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index b2bb16792..5d79a4ab6 100644
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -91,16 +91,14 @@ void FeedMessageViewer::loadSize() {
 
 void FeedMessageViewer::quitDownloader() {
   qDebug("Quitting feed downloader thread.");
-
   m_feedDownloaderThread->quit();
 
   qDebug("Feed downloader thread aborted.");
-
   m_feedDownloader->deleteLater();
 }
 
 void FeedMessageViewer::updateSelectedFeeds() {
-  if (SystemFactory::instance()->applicationCloseLock()->tryLockForRead()) {
+  if (SystemFactory::instance()->applicationCloseLock()->tryLockForWrite()) {
     emit feedsUpdateRequested(m_feedsView->selectedFeeds());
   }
   else {
@@ -109,7 +107,7 @@ void FeedMessageViewer::updateSelectedFeeds() {
 }
 
 void FeedMessageViewer::updateAllFeeds() {
-  if (SystemFactory::instance()->applicationCloseLock()->tryLockForRead()) {
+  if (SystemFactory::instance()->applicationCloseLock()->tryLockForWrite()) {
     emit feedsUpdateRequested(m_feedsView->allFeeds());
   }
   else {
diff --git a/src/gui/feedmessageviewer.h b/src/gui/feedmessageviewer.h
index 86352b8b5..b1b410fe7 100644
--- a/src/gui/feedmessageviewer.h
+++ b/src/gui/feedmessageviewer.h
@@ -43,7 +43,7 @@ class FeedMessageViewer : public TabContent {
     void quitDownloader();
 
   public slots:
-    // Feed updates.
+    // Feed updating.
     void updateSelectedFeeds();
     void updateAllFeeds();
 
diff --git a/src/gui/formsettings.ui b/src/gui/formsettings.ui
index 7314ebaf6..76ec5cf80 100644
--- a/src/gui/formsettings.ui
+++ b/src/gui/formsettings.ui
@@ -102,8 +102,8 @@ Authors of this application are NOT responsible for lost data.</string>
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>564</width>
-            <height>363</height>
+            <width>100</width>
+            <height>30</height>
            </rect>
           </property>
           <layout class="QHBoxLayout" name="horizontalLayout_4">
@@ -180,8 +180,8 @@ Authors of this application are NOT responsible for lost data.</string>
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>558</width>
-                <height>337</height>
+                <width>167</width>
+                <height>219</height>
                </rect>
               </property>
               <layout class="QFormLayout" name="formLayout">
@@ -763,6 +763,13 @@ Authors of this application are NOT responsible for lost data.</string>
            <property name="fieldGrowthPolicy">
             <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
            </property>
+           <item row="0" column="0">
+            <widget class="QCheckBox" name="m_checkRemoveReadMessagesOnExit">
+             <property name="text">
+              <string>Remove all read messages from standard feeds on application exit</string>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
         </widget>