diff --git a/TODO-before-release b/TODO-before-release
index 670738c00..953050457 100644
--- a/TODO-before-release
+++ b/TODO-before-release
@@ -12,22 +12,23 @@ Port shortcut
 
 
 Migrate color config
-=> from [Reader] to [MessageListView::Colors]
+=> from [Reader] to [MessageListView::Colors] (done in kmail-udp id=4.4-akonadi)
         NewMessage  to NewMessageColor
         UnreadMessage to UnreadMessageColor
         FlagMessage to ImportantMessageColor
         ToActMessage to TodoMessageColor
 
-=> from [Reader] to [MessageListView::Fonts]
+=> from [Reader] to [MessageListView::Fonts] (done in kmail-udp id = 4.4-akonadi)
         list-font to MessageListFont
         list-important-font to ImportantMessageFont
         list-new-font to NewMessageFont
         list-unread-font to UnreadMessageFont
         list-toact-font to TodoMessageFont
+
 => from [MessageListView]
-        DisplayMessageToolTips to MessageToolTipEnabled
-        HideTabBarWithSingleTab to AutoHideTabBarWithSingleTab
+        DisplayMessageToolTips to MessageToolTipEnabled (done in kmail-udp id=4.4-akonadi)
+        HideTabBarWithSingleTab to AutoHideTabBarWithSingleTab (done in kmail-udp id = 4.4-akonadi)
 
 from [Reader] to [Reader] (rename just item)
-        showColorbar  to showColorBar
+        showColorbar  to showColorBar (done in kmail-udp id=4.4-akonadi)
  
diff --git a/kmmainwidget.cpp b/kmmainwidget.cpp
index 4f2d70cac..4de80f6fc 100644
--- a/kmmainwidget.cpp
+++ b/kmmainwidget.cpp
@@ -2718,10 +2718,10 @@ void KMMainWidget::showOfflinePage()
 //-----------------------------------------------------------------------------
 void KMMainWidget::slotReplaceMsgByUnencryptedVersion()
 {
-#ifdef OLD_MESSAGELIST
   kDebug();
-  KMime::Message* oldMsg = mMessageListView->currentMessage();
-  if( oldMsg ) {
+  Akonadi::Item oldMsg = mMessagePane->currentItem();
+  if( oldMsg.isValid() ) {
+#if 0
     kDebug() << "Old message found";
     if( oldMsg->hasUnencryptedMsg() ) {
       kDebug() << "Extra unencrypted message found";
@@ -2776,9 +2776,11 @@ void KMMainWidget::slotReplaceMsgByUnencryptedVersion()
       kDebug() << "Done.";
     } else
       kDebug() << "NO EXTRA UNENCRYPTED MESSAGE FOUND";
+#else
+   kDebug() << "AKONADI PORT: Disabled code in  " << Q_FUNC_INFO;
+#endif
   } else
     kDebug() << "PANIC: NO OLD MESSAGE FOUND";
-#endif
 }
 
 void KMMainWidget::slotFocusOnNextMessage()