Fix use good config, now we can use color in messageviewer, remove move config (was not necessary)

(cherry picked from commit 1d59e73aa846306983c216b18de015763f3a9025)

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.

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;
 }