diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
index 5ed97813c831dbda7a7bbbdd52efd0904fbdbfcf..1f370f8b04858755a3e2f899e435bd80b5083949 100644
--- a/kmail/kmmainwidget.cpp
+++ b/kmail/kmmainwidget.cpp
@@ -491,6 +491,7 @@ void KMMainWidget::folderSelected( const Akonadi::Collection & col )
         case GlobalSettings::EnumActionEnterFolder::SelectOldest:
             mPreSelectionMode = MessageList::Core::PreSelectOldestCentered;
             break;
+        case GlobalSettings::EnumActionEnterFolder::SelectNone:
         default:
             mPreSelectionMode = MessageList::Core::PreSelectNone;
             break;
diff --git a/kmail/settings/kmail.kcfg.cmake b/kmail/settings/kmail.kcfg.cmake
index 2f4a8df54c6c3d1c038384f835361cef83b77dfd..86d8bafdc6d032b45c93ab8f1a1792ae3d8fab44 100644
--- a/kmail/settings/kmail.kcfg.cmake
+++ b/kmail/settings/kmail.kcfg.cmake
@@ -18,6 +18,7 @@
           <choice name="SelectLastSelected"/>
           <choice name="SelectNewest"/>
           <choice name="SelectOldest"/>
+          <choice name="SelectNone"/>
         </choices>
         <default>SelectLastSelected</default>
       </entry>
diff --git a/kmail/ui/miscpagemaintab.ui b/kmail/ui/miscpagemaintab.ui
index db7aa7c9180fe9f8e59114e5c9bd21a9ba6d06a5..69d6d54a675bdf350fbc48975f35bd84eef14cc1 100644
--- a/kmail/ui/miscpagemaintab.ui
+++ b/kmail/ui/miscpagemaintab.ui
@@ -126,6 +126,11 @@ p, li { white-space: pre-wrap; }
          <string>Jump to Oldest Message</string>
         </property>
        </item>
+       <item>
+        <property name="text">
+         <string>Do Nothing</string>
+        </property>
+       </item>
       </widget>
      </item>
      <item row="4" column="0">