diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,7 +62,7 @@
 set(KSIEVE_LIB_VERSION "5.1.42")
 set(LIBKDEPIM_LIB_VERSION "5.1.42")
 set(MAILIMPORTER_LIB_VERSION "5.1.42")
-set(MESSAGELIB_LIB_VERSION "5.1.61")
+set(MESSAGELIB_LIB_VERSION "5.1.64")
 set(KDEPIM_APPS_LIB_VERSION "5.1.42")
 set(LIBKLEO_LIB_VERSION "5.1.42")
 set(KDEPIMLIBS_LIB_VERSION "5.1.42")
diff --git a/examples/apps/coisceim/itemviewerwidget.cpp b/examples/apps/coisceim/itemviewerwidget.cpp
--- a/examples/apps/coisceim/itemviewerwidget.cpp
+++ b/examples/apps/coisceim/itemviewerwidget.cpp
@@ -71,7 +71,7 @@
     Akonadi::Item item = selectedIndex.data(EntityTreeModel::ItemRole).value<Akonadi::Item>();
     if (mimeType == QLatin1String("message/rfc822")) {
         m_widgetStack->setCurrentIndex(1);
-        m_mailViewer->setMessageItem(item, MessageViewer::Viewer::Force);
+        m_mailViewer->setMessageItem(item, MessageViewer::Force);
         return;
     }
     if (mimeType == QLatin1String("text/directory")) {
diff --git a/examples/apps/etm_usage/itemviewerwidget.cpp b/examples/apps/etm_usage/itemviewerwidget.cpp
--- a/examples/apps/etm_usage/itemviewerwidget.cpp
+++ b/examples/apps/etm_usage/itemviewerwidget.cpp
@@ -72,7 +72,7 @@
     Akonadi::Item item = selectedIndex.data(EntityTreeModel::ItemRole).value<Akonadi::Item>();
     if (mimeType == QLatin1String("message/rfc822")) {
         m_widgetStack->setCurrentIndex(1);
-        m_mailViewer->setMessageItem(item, MessageViewer::Viewer::Force);
+        m_mailViewer->setMessageItem(item, MessageViewer::Force);
         return;
     }
     if (mimeType == QLatin1String("text/directory")) {
diff --git a/examples/apps/mailreader/mailreaderview.cpp b/examples/apps/mailreader/mailreaderview.cpp
--- a/examples/apps/mailreader/mailreaderview.cpp
+++ b/examples/apps/mailreader/mailreaderview.cpp
@@ -59,7 +59,7 @@
     qDebug() << "Show item with ID: " << item.id();
     m_readerWin->enableMessageDisplay();
     m_readerWin->setDecryptMessageOverwrite(false);
-    m_readerWin->setMessageItem(item, MessageViewer::Viewer::Force);
+    m_readerWin->setMessageItem(item, MessageViewer::Force);
 }
 
 void mailreaderView::showAboutPage()
diff --git a/plugins/messageviewer/bodypartformatter/vcard/text_vcard.cpp b/plugins/messageviewer/bodypartformatter/vcard/text_vcard.cpp
--- a/plugins/messageviewer/bodypartformatter/vcard/text_vcard.cpp
+++ b/plugins/messageviewer/bodypartformatter/vcard/text_vcard.cpp
@@ -121,7 +121,7 @@
             bodyPart->setBodyPartMemento(memento);
 
             if (asyncResultObserver) {
-                QObject::connect(memento, SIGNAL(update(MessageViewer::Viewer::UpdateMode)), asyncResultObserver, SLOT(update(MessageViewer::Viewer::UpdateMode)));
+                QObject::connect(memento, SIGNAL(update(MessageViewer::UpdateMode)), asyncResultObserver, SLOT(update(MessageViewer::UpdateMode)));
             }
         }
 
diff --git a/plugins/messageviewer/bodypartformatter/vcard/vcardmemento.h b/plugins/messageviewer/bodypartformatter/vcard/vcardmemento.h
--- a/plugins/messageviewer/bodypartformatter/vcard/vcardmemento.h
+++ b/plugins/messageviewer/bodypartformatter/vcard/vcardmemento.h
@@ -67,7 +67,7 @@
 
 Q_SIGNALS:
     // TODO: Factor our update and detach into base class
-    void update(MessageViewer::Viewer::UpdateMode);
+    void update(MessageViewer::UpdateMode);
 
 private:
     void checkEmail();
diff --git a/plugins/messageviewer/bodypartformatter/vcard/vcardmemento.cpp b/plugins/messageviewer/bodypartformatter/vcard/vcardmemento.cpp
--- a/plugins/messageviewer/bodypartformatter/vcard/vcardmemento.cpp
+++ b/plugins/messageviewer/bodypartformatter/vcard/vcardmemento.cpp
@@ -74,7 +74,7 @@
 {
     if (mIndex == mVCardList.count()) {
         mFinished = true;
-        Q_EMIT update(Viewer::Delayed);
+        Q_EMIT update(Delayed);
     } else {
         checkEmail();
     }
@@ -87,7 +87,7 @@
 
 void VcardMemento::detach()
 {
-    disconnect(this, SIGNAL(update(MessageViewer::Viewer::UpdateMode)), 0, 0);
+    disconnect(this, SIGNAL(update(MessageViewer::UpdateMode)), 0, 0);
 }
 
 bool VcardMemento::vcardExist(int index) const