diff --git a/kconf_update/kmail.upd b/kconf_update/kmail.upd
index 1904b6daf..2338415fa 100644
--- a/kconf_update/kmail.upd
+++ b/kconf_update/kmail.upd
@@ -221,23 +221,6 @@ Key=FlagMessage,ImportantMessageColor
 Key=ToActMessage,TodoMessageColor
 
 
-#MDN settings
-Id=4.6-akonadi
-File=kmail2rc,mailviewerrc
-Group=MDN
-Key=default-policy
-Key=not-send-when-encrypted
-Key=quote-message
-
-#MDN settings
-Id=4.6-before-migrate-akonadi
-File=kmailrc,mailviewerrc
-Group=MDN
-Key=default-policy
-Key=not-send-when-encrypted
-Key=quote-message
-
-
 #
 # Important notice:
 # If you add updates here, keep this text below them.
diff --git a/kmkernel.cpp b/kmkernel.cpp
index e74e4b104..a75ee4997 100644
--- a/kmkernel.cpp
+++ b/kmkernel.cpp
@@ -1436,6 +1436,9 @@ KSharedConfig::Ptr KMKernel::config()
     MessageComposer::MessageComposerSettings::self()->readConfig();
     MessageCore::GlobalSettings::self()->setSharedConfig( mySelf->mConfig );
     MessageCore::GlobalSettings::self()->readConfig();
+    MessageViewer::GlobalSettings::self()->setSharedConfig( mySelf->mConfig );
+    MessageViewer::GlobalSettings::self()->readConfig();
+
   }
   return mySelf->mConfig;
 }