diff --git a/CMakeLists.txt b/CMakeLists.txt
index 451d31d1a9..00113e75c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,283 +1,283 @@
 project(kdepim)
 
 cmake_minimum_required(VERSION 3.1)
 option(KDEPIM_SUPERBUILD "Build standalone apps (experimental not used for distro)" FALSE)
 
 if (KDEPIM_SUPERBUILD)
     # Remove it when splitted
     # This CMakeLists.txt is a "superbuild" for the frameworks.
     # This means it can be used to build them all standalone one-by-one.
     # This is useful to compile all them with one command.
     # use mkdir build && cd build && cmake -DKDEPIM_SUPERBUILD=TRUE ../ && make -j8 sb_all
 
     include(SuperBuild.cmake)
     sb_add_project(kmail)
     sb_add_project(grantleeeditor)
 
 
     sb_add_project(korganizer)
     sb_add_project(sieveeditor)
     sb_add_project(storageservicemanager)
     sb_add_project(akregator)
     sb_add_project(importwizard)
     sb_add_project(kaddressbook)
     sb_add_project(mboximporter)
     sb_add_project(knotes)
     sb_add_project(ktnef)
     sb_add_project(pimsettingexporter)
     sb_add_project(kalarm)
     sb_add_project(blogilo)
 
 
     sb_add_project(kontact)
 
     sb_add_project(akonadiconsole)
     sb_add_project(console)
 
     sb_add_project(accountwizard)
 
     # doc must be a subdir of kdepim or packagers will kill us
     # Need to move in subdirectory add_subdirectory(doc)
     sb_end()
 
 else()
 
 
     if (POLICY CMP0063)
         cmake_policy(SET CMP0063 NEW)
     endif()
 
 
     set(LIBRARY_NAMELINK LIBRARY NAMELINK_SKIP)
 
     # we need some parts of the ECM CMake helpers
     set(KF5_VERSION "5.23.0")
     find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE)
     set(CMAKE_MODULE_PATH ${kdepim_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH})
     include(ECMOptionalAddSubdirectory)
     include(ECMInstallIcons)
     include(ECMSetupVersion)
     include(ECMAddTests)
     include(ECMMarkNonGuiExecutable)
     include(GenerateExportHeader)
     include(ECMGenerateHeaders)
     include(CMakePackageConfigHelpers)
     include(FeatureSummary)
     include(CheckFunctionExists)
     include(ECMGeneratePriFile)
 
     include(KDEInstallDirs)
     include(KDECMakeSettings)
     include(KDECompilerSettings NO_POLICY_SCOPE)
     include(ECMAddAppIcon)
     include(ECMQtDeclareLoggingCategory)
 
     # KDEPIM_VERSION
     # Version scheme: "x.y.z build".
     #
     # x is the version number.
     # y is the major release number.
     # z is the minor release number.
     #
     # "x.y.z" follow the kdelibs version kdepim is released with.
     #
     # If "z" is 0, the version is "x.y"
     #
     # KDEPIM_DEV_VERSION is empty for final versions.
     # For development versions "build" is something like "pre", "alpha1", "alpha2", "beta1", "beta2", "rc1", "rc2".
     #
     # Examples in chronological order:
     # 3.0, 3.0.1, 3.1 alpha1, 3.1 beta1, 3.1 beta2, 3.1 rc1, 3.1, 3.1.1, 3.2 pre, 3.2 alpha1
 
     # Do NOT add quote
     set(KDEPIM_DEV_VERSION beta1)
 
     # add an extra space
     if(DEFINED KDEPIM_DEV_VERSION)
         set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
     endif()
 
     set(KDEPIM_VERSION_NUMBER "5.2.80")
     set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
 
 
     set(AKONADI_MIMELIB_VERSION "5.2.80")
     set(AKONADI_CONTACT_VERSION "5.2.80")
     set(KCONTACTS_LIB_VERSION "5.2.81")
     set(KCALENDARCORE_LIB_VERSION "5.2.80")
     set(IDENTITYMANAGEMENT_LIB_VERSION "5.2.80")
     set(KLDAP_LIB_VERSION "5.2.80")
     set(KMAILTRANSPORT_LIB_VERSION "5.2.80")
     set(CALENDARUTILS_LIB_VERSION "5.2.80")
     set(KHOLIDAYS_LIB_VERSION "5.2.80")
     set(KTNEF_LIB_VERSION "5.2.80")
     set(KIMAP_LIB_VERSION "5.2.80")
     set(KMBOX_LIB_VERSION "5.2.80")
     set(AKONADICALENDAR_LIB_VERSION "5.2.80")
     set(SYNDICATION_LIB_VERSION "5.2.80")
     set(GPGMEPP_LIB_VERSION "5.2.80")
     set(KONTACTINTERFACE_LIB_VERSION "5.2.80")
     set(AKONADIKALARM_LIB_VERSION "5.2.80")
     set(KMIME_LIB_VERSION "5.2.80")
     set(XMLRPCCLIENT_LIB_VERSION "5.2.80")
     set(KBLOG_LIB_VERSION "5.2.80")
     set(KPIMTEXTEDIT_LIB_VERSION "5.2.80")
     set(AKONADI_VERSION "5.2.80")
 
     set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
     set(KDEPIM_LIB_SOVERSION "5")
     set(AKONADINOTES_LIB_VERSION "5.2.80")
 
     set(QT_REQUIRED_VERSION "5.6.0")
     option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE)
     find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Sql Concurrent UiTools WebEngine WebEngineWidgets)
     find_package(Qt5X11Extras NO_MODULE)
     find_package(Grantlee5 "5.1" CONFIG REQUIRED)
     set(LIBGRAVATAR_VERSION_LIB "5.2.80")
     set(LIBMAILIMPORTER_VERSION_LIB "5.2.80")
     set(MAILCOMMON_LIB_VERSION_LIB "5.2.80")
     set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.80")
-    set(MESSAGELIB_LIB_VERSION_LIB "5.2.90")
+    set(MESSAGELIB_LIB_VERSION_LIB "5.2.91")
     set(LIBKLEO_LIB_VERSION_LIB "5.2.80")
     set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.2.80")
     set(PIMCOMMON_LIB_VERSION_LIB "5.2.80")
     set(LIBKDEPIM_LIB_VERSION_LIB "5.2.80")
     set(LIBINCIDENCEEDITOR_LIB_VERSION_LIB "5.2.80")
     set(CALENDARSUPPORT_LIB_VERSION_LIB "5.2.80")
     set(EVENTVIEW_LIB_VERSION_LIB "5.2.80")
     set(KDGANTT2_LIB_VERSION_LIB "5.2.80")
     set(LIBKSIEVE_LIB_VERSION_LIB "5.2.82")
 
     find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
     set(WEBENGINE_TYPE "QtWebEngine")
 
     # Find KF5 package
     find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5NewStuff ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5KCMUtils ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Archive ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5NotifyConfig ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Service ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Auth ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5DocTools ${KF5_VERSION} REQUIRED)
     find_package(Phonon4Qt5 CONFIG REQUIRED)
     find_package(KF5DNSSD ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5TextEditor ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Sonnet ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5GlobalAccel ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Codecs ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Crash ${KF5_VERSION} REQUIRED)
 
     # Find KdepimLibs Package
     find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
     find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5CalendarCore ${KCALENDARCORE_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED)
     find_package(KF5IdentityManagement ${IDENTITYMANAGEMENT_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5Ldap ${KLDAP_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5MailTransport ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5AkonadiMime ${AKONADI_MIMELIB_VERSION} CONFIG REQUIRED)
     find_package(KF5CalendarUtils ${CALENDARUTILS_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5Holidays ${KHOLIDAYS_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5Tnef ${KTNEF_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5IMAP ${KIMAP_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5Mbox ${KMBOX_LIB_VERSION} CONFIG REQUIRED)
 
     find_package(KF5AkonadiCalendar ${AKONADICALENDAR_LIB_VERSION} CONFIG REQUIRED)
 
     find_package(KF5Syndication ${SYNDICATION_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5Gpgmepp ${GPGMEPP_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5KontactInterface ${KONTACTINTERFACE_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5AlarmCalendar ${AKONADIKALARM_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5XmlRpcClient ${XMLRPCCLIENT_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5Blog ${KBLOG_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5AkonadiNotes ${AKONADINOTES_LIB_VERSION} CONFIG REQUIRED)
 
 
     find_package(KF5Gravatar ${LIBGRAVATAR_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5MailImporter ${LIBMAILIMPORTER_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5MailCommon ${MAILCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5KaddressbookGrantlee ${KDEPIM_APPS_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5GrantleeTheme ${LIBGRANTLEETHEME_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5PimCommon ${PIMCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5IncidenceEditor ${LIBINCIDENCEEDITOR_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5MessageCore ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5MessageComposer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5MessageList ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5TemplateParser ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5EventViews ${EVENTVIEW_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5KDGantt2 ${KDGANTT2_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5FollowupReminder ${KDEPIM_APPS_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5SendLater ${KDEPIM_APPS_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5KdepimDBusInterfaces ${KDEPIM_APPS_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5LibKSieve ${LIBKSIEVE_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(MailTransportDBusService CONFIG REQUIRED)
 
 
     if (NOT APPLE)
         find_package(X11)
     endif()
 
     set(KDEPIM_HAVE_X11 ${X11_FOUND})
 
     # Extra package
     find_package(KF5GAPI "5.2.80" CONFIG)
 
     include_directories(${kdepim_SOURCE_DIR} ${kdepim_BINARY_DIR})
 
     add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 
     find_package(KF5AkonadiSearch "5.2.80" CONFIG REQUIRED)
     set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi")
 
     if(KDEPIM_ENTERPRISE_BUILD)
         message(STATUS "Enterprise build is enabled.")
     endif()
 
     ############### Desktop vs. Mobile options ##############
 
     find_package(Boost 1.34.0)
     set_package_properties(Boost PROPERTIES DESCRIPTION "Boost C++ Libraries" URL "http://www.boost.org" TYPE REQUIRED PURPOSE "Boost is required for building most KDEPIM applications")
 
     add_subdirectory(kmail)
     add_subdirectory(grantleeeditor)
 
 
     add_subdirectory(korganizer)
     add_subdirectory(sieveeditor)
     add_subdirectory(storageservicemanager)
     add_subdirectory(akregator)
     add_subdirectory(importwizard)
     add_subdirectory(kaddressbook)
     add_subdirectory(mboximporter)
     add_subdirectory(knotes)
     add_subdirectory(ktnef)
     add_subdirectory(pimsettingexporter)
     add_subdirectory(kalarm)
     add_subdirectory(blogilo)
 
 
     add_subdirectory(kontact)
 
     add_subdirectory(akonadiconsole)
     add_subdirectory(console)
 
     add_subdirectory(accountwizard)
 
     # doc must be a subdir of kdepim or packagers will kill us
     add_subdirectory(doc)
 
     feature_summary(WHAT ALL
         INCLUDE_QUIET_PACKAGES
         FATAL_ON_MISSING_REQUIRED_PACKAGES
         )
 endif()
diff --git a/accountwizard/CMakeLists.txt b/accountwizard/CMakeLists.txt
index 5dd05d301b..cb9a3fef5d 100644
--- a/accountwizard/CMakeLists.txt
+++ b/accountwizard/CMakeLists.txt
@@ -1,125 +1,125 @@
 project(accountwizard)
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${accountwizard_SOURCE_DIR})
     cmake_minimum_required(VERSION 3.1)
 
     set(LIBRARY_NAMELINK LIBRARY NAMELINK_SKIP)
 
     # we need some parts of the ECM CMake helpers
     set(KF5_VERSION "5.23.0")
     find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE)
     set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
     include(ECMOptionalAddSubdirectory)
     include(ECMInstallIcons)
     include(ECMSetupVersion)
     include(ECMAddTests)
     include(ECMMarkNonGuiExecutable)
     include(GenerateExportHeader)
     include(ECMGenerateHeaders)
     include(CMakePackageConfigHelpers)
     include(FeatureSummary)
     include(CheckFunctionExists)
     include(ECMGeneratePriFile)
 
     include(KDEInstallDirs)
     include(KDECMakeSettings)
     include(KDECompilerSettings NO_POLICY_SCOPE)
     include(ECMAddAppIcon)
     include(ECMQtDeclareLoggingCategory)
 
     # Do NOT add quote
     set(KDEPIM_DEV_VERSION beta1)
 
     # add an extra space
     if(DEFINED KDEPIM_DEV_VERSION)
         set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
     endif()
 
 
     set(KDEPIM_VERSION_NUMBER "5.2.80")
     set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
 
     set(AKONADI_MIMELIB_VERSION "5.2.80")
     set(AKONADI_CONTACT_VERSION "5.2.80")
     set(KCONTACTS_LIB_VERSION "5.2.81")
     set(IDENTITYMANAGEMENT_LIB_VERSION "5.2.80")
     set(KLDAP_LIB_VERSION "5.2.80")
     set(KMAILTRANSPORT_LIB_VERSION "5.2.80")
     set(KPIMTEXTEDIT_LIB_VERSION "5.2.80")
     set(AKONADI_VERSION "5.2.80")
 
     set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
     set(KDEPIM_LIB_SOVERSION "5")
 
     set(QT_REQUIRED_VERSION "5.6.0")
     option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE)
     find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Xml DBus Test)
     set(MAILCOMMON_LIB_VERSION_LIB "5.2.80")
-    set(MESSAGELIB_LIB_VERSION_LIB "5.2.90")
+    set(MESSAGELIB_LIB_VERSION_LIB "5.2.91")
     set(PIMCOMMON_LIB_VERSION_LIB "5.2.80")
     set(LIBKDEPIM_LIB_VERSION_LIB "5.2.80")
 
     # Find KF5 package
     find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5KCMUtils ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5NotifyConfig ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Service ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5DocTools ${KF5_VERSION} REQUIRED)
     find_package(KF5TextEditor ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Codecs ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Crash ${KF5_VERSION} REQUIRED)
     # Find KdepimLibs Package
     find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
     find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED)
     find_package(KF5IdentityManagement ${IDENTITYMANAGEMENT_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5Ldap ${KLDAP_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5MailTransport ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5MailCommon ${MAILCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5PimCommon ${PIMCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(MailTransportDBusService CONFIG REQUIRED)
 
 
     include_directories(${accountwizard_SOURCE_DIR} ${accountwizard_BINARY_DIR})
     add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 
 endif()
 add_definitions(-DQT_USE_QSTRINGBUILDER)
 
 # Qt5 package
 find_package(Qt5UiTools ${QT_REQUIRED_VERSION} CONFIG REQUIRED)
 
 find_package(KF5Kross ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5NewStuff ${KF5_VERSION} CONFIG REQUIRED)
 
 set( SHARED_MIME_INFO_MINIMUM_VERSION "0.40" )
 find_package( SharedMimeInfo REQUIRED )
 
 add_definitions( -DQT_NO_CAST_FROM_ASCII )
 add_definitions( -DQT_NO_CAST_TO_ASCII )
 
 # allow to disable GHNS support on resource-constrained systems
 option( ACCOUNTWIZARD_NO_GHNS "Disable GHNS support in the account wizard" FALSE )
 
 option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE)
 
 # config-enterprise.h is needed for both ENTERPRISE_BUILD and BUILD_EVERYTHING
 configure_file(src/config-enterprise.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config-enterprise.h )
 
 if ( ACCOUNTWIZARD_NO_GHNS )
     add_definitions( -DACCOUNTWIZARD_NO_GHNS )
 endif ()
 
 
 
 add_subdirectory(src)
 install( FILES accountwizard.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
 
 if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
     feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 endif()
diff --git a/akonadiconsole/CMakeLists.txt b/akonadiconsole/CMakeLists.txt
index 0c87b2bcd0..b1a0e26772 100644
--- a/akonadiconsole/CMakeLists.txt
+++ b/akonadiconsole/CMakeLists.txt
@@ -1,101 +1,101 @@
 project(akonadiconsole)
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${akonadiconsole_SOURCE_DIR})
     cmake_minimum_required(VERSION 3.1)
     set(KF5_VERSION "5.23.0")
     find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE)
     set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
     include(ECMInstallIcons)
 
     include(ECMOptionalAddSubdirectory)
     include(ECMSetupVersion)
     include(ECMAddTests)
     include(ECMMarkNonGuiExecutable)
     include(GenerateExportHeader)
     include(ECMGenerateHeaders)
     include(CMakePackageConfigHelpers)
     include(FeatureSummary)
     include(CheckFunctionExists)
     include(ECMGeneratePriFile)
 
     include(KDEInstallDirs)
     include(KDECMakeSettings)
     include(KDECompilerSettings NO_POLICY_SCOPE)
     include(ECMAddAppIcon)
     include(ECMQtDeclareLoggingCategory)
 
 
     # Do NOT add quote
     set(KDEPIM_DEV_VERSION beta1)
 
     # add an extra space
     if(DEFINED KDEPIM_DEV_VERSION)
         set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
     endif()
 
 
     set(KDEPIM_VERSION_NUMBER "5.2.80")
     set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
 
 
     set(AKONADI_MIMELIB_VERSION "5.2.80")
     set(AKONADI_CONTACT_VERSION "5.2.80")
     set(CALENDARSUPPORT_LIB_VERSION_LIB "5.2.80")
     set(KPIMTEXTEDIT_LIB_VERSION "5.2.80")
     set(AKONADI_VERSION "5.2.80")
 
     set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
     set(KDEPIM_LIB_SOVERSION "5")
 
 
     set(QT_REQUIRED_VERSION "5.6.0")
     find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Sql)
     set(LIBMAILIMPORTER_VERSION_LIB "5.2.80")
-    set(MESSAGELIB_LIB_VERSION_LIB "5.2.90")
+    set(MESSAGELIB_LIB_VERSION_LIB "5.2.91")
     set(LIBKLEO_LIB_VERSION_LIB "5.2.80")
     set(LIBKDEPIM_LIB_VERSION_LIB "5.2.80")
     set(KCALENDARCORE_LIB_VERSION "5.2.80")
     set(KCONTACTS_LIB_VERSION "5.2.81")
     set(KMIME_LIB_VERSION "5.2.80")
 
     # Find KF5 package
     find_package(KF5Completion ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5ConfigWidgets ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5DocTools ${KF5_VERSION} REQUIRED)
     find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5ItemModels ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5TextWidgets ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5WidgetsAddons ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Crash ${KF5_VERSION} REQUIRED)
 
     # Find KdepimLibs Package
     find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
     find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5CalendarCore ${KCALENDARCORE_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED)
     find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5AkonadiMime ${AKONADI_MIMELIB_VERSION} CONFIG REQUIRED)
 
 
     find_package(KF5MailImporter ${LIBMAILIMPORTER_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION_LIB} CONFIG REQUIRED)
 
     include_directories(${akonadiconsole_SOURCE_DIR} ${akonadiconsole_BINARY_DIR})
     add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 endif()
 
 add_definitions(-DQT_USE_QSTRINGBUILDER)
 install( FILES akonadiconsole.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
 
 add_subdirectory(src)
 if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
     feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 endif()
diff --git a/akregator/CMakeLists.txt b/akregator/CMakeLists.txt
index 2f744963ed..a430bc12fd 100644
--- a/akregator/CMakeLists.txt
+++ b/akregator/CMakeLists.txt
@@ -1,103 +1,103 @@
 project(akregator)
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${akregator_SOURCE_DIR})
     cmake_minimum_required(VERSION 3.1)
     set(KF5_VERSION "5.23.0")
     find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE)
     set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
     include(ECMInstallIcons)
 
     include(ECMOptionalAddSubdirectory)
     include(ECMSetupVersion)
     include(ECMAddTests)
     include(ECMMarkNonGuiExecutable)
     include(GenerateExportHeader)
     include(ECMGenerateHeaders)
     include(CMakePackageConfigHelpers)
     include(FeatureSummary)
     include(CheckFunctionExists)
     include(ECMGeneratePriFile)
 
     include(KDEInstallDirs)
     include(KDECMakeSettings)
     include(KDECompilerSettings NO_POLICY_SCOPE)
     include(ECMAddAppIcon)
     include(ECMQtDeclareLoggingCategory)
 
     # Do NOT add quote
     set(KDEPIM_DEV_VERSION beta1)
 
     # add an extra space
     if(DEFINED KDEPIM_DEV_VERSION)
         set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
     endif()
 
 
     set(KDEPIM_VERSION_NUMBER "5.2.80")
     set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
     set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
     set(KDEPIM_LIB_SOVERSION "5")
 
     set(QT_REQUIRED_VERSION "5.6.0")
 
     set(KONTACTINTERFACE_LIB_VERSION "5.2.80")
     set(KPIMTEXTEDIT_LIB_VERSION "5.2.80")
     set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.2.80")
     set(LIBKDEPIM_LIB_VERSION_LIB "5.2.80")
     set(LIBKLEO_LIB_VERSION_LIB "5.2.80")
-    set(MESSAGELIB_LIB_VERSION_LIB "5.2.90")
+    set(MESSAGELIB_LIB_VERSION_LIB "5.2.91")
     set(PIMCOMMON_LIB_VERSION_LIB "5.2.80")
     set(SYNDICATION_LIB_VERSION "5.2.80")
 
     find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test WebEngine WebEngineWidgets)
     find_package(Grantlee5 "5.1" CONFIG REQUIRED)
 
     # Find KF5 package
     find_package(KF5Crash ${KF5_VERSION} REQUIRED)
     find_package(KF5DocTools ${KF5_VERSION} REQUIRED)
     find_package(KF5KCMUtils ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5NotifyConfig ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Parts ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5TextEditor ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED)
 
     # Find KdepimLibs Package
     find_package(KF5AkonadiMime ${AKONADI_MIMELIB_VERSION} CONFIG REQUIRED)
     find_package(KF5GrantleeTheme ${LIBGRANTLEETHEME_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5KontactInterface ${KONTACTINTERFACE_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5PimCommon ${PIMCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5Syndication ${SYNDICATION_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
     set(WEBENGINE_TYPE "QtWebEngine")
     add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 
 endif()
 add_definitions(-DQT_USE_QSTRINGBUILDER)
 include_directories(${akregator_SOURCE_DIR} ${akregator_BINARY_DIR})
 include(CheckTypeSize)
 check_type_size("long" SIZEOF_LONG)
 configure_file(config-akregator.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-akregator.h)
 add_definitions(-DTRANSLATION_DOMAIN=\"akregator\")
 
 
 add_definitions( -DQT_NO_CAST_FROM_ASCII )
 add_definitions( -DQT_NO_CAST_TO_ASCII )
 
 
 add_subdirectory(export)
 add_subdirectory(interfaces)
 add_subdirectory(plugins)
 add_subdirectory(configuration)
 add_subdirectory(src)
 add_subdirectory(kontactplugin)
 add_subdirectory(kconf_update)
 
 install( FILES akregator.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
 
 if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
     feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 endif()
diff --git a/blogilo/CMakeLists.txt b/blogilo/CMakeLists.txt
index bf7a4b50d4..6dd762a704 100644
--- a/blogilo/CMakeLists.txt
+++ b/blogilo/CMakeLists.txt
@@ -1,90 +1,90 @@
 project(blogilo)
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${blogilo_SOURCE_DIR})
     cmake_minimum_required(VERSION 3.1)
     set(KF5_VERSION "5.23.0")
     find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE)
     set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
     include(ECMInstallIcons)
 
     include(ECMOptionalAddSubdirectory)
     include(ECMSetupVersion)
     include(ECMAddTests)
     include(ECMMarkNonGuiExecutable)
     include(GenerateExportHeader)
     include(ECMGenerateHeaders)
     include(CMakePackageConfigHelpers)
     include(FeatureSummary)
     include(CheckFunctionExists)
     include(ECMGeneratePriFile)
 
     include(KDEInstallDirs)
     include(KDECMakeSettings)
     include(KDECompilerSettings NO_POLICY_SCOPE)
     include(ECMAddAppIcon)
     include(ECMQtDeclareLoggingCategory)
 
 
     # Do NOT add quote
     set(KDEPIM_DEV_VERSION beta1)
 
     # add an extra space
     if(DEFINED KDEPIM_DEV_VERSION)
         set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
     endif()
 
 
     set(KDEPIM_VERSION_NUMBER "5.2.80")
     set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
 
 
     set(KPIMTEXTEDIT_LIB_VERSION "5.2.80")
     set(KBLOG_LIB_VERSION "5.2.80")
     set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
     set(KDEPIM_LIB_SOVERSION "5")
 
     set(QT_REQUIRED_VERSION "5.6.0")
     find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Sql WebEngine WebEngineWidgets)
     set(PIMCOMMON_LIB_VERSION_LIB "5.2.80")
     set(LIBKDEPIM_LIB_VERSION_LIB "5.2.80")
-    set(MESSAGELIB_LIB_VERSION_LIB "5.2.90")
+    set(MESSAGELIB_LIB_VERSION_LIB "5.2.91")
     # Find KF5 package
     find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5DocTools ${KF5_VERSION} REQUIRED)
     find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5TextEditor ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5PimCommon ${PIMCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5Crash ${KF5_VERSION} REQUIRED)
 
 
 
     # Find KdepimLibs Package
     find_package(KF5Blog ${KBLOG_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
     set(WEBENGINE_TYPE "QtWebEngine")
 
     # Extra package
     find_package(KF5GAPI "5.2.80" CONFIG)
 
     include_directories(${blogilo_SOURCE_DIR} ${blogilo_BINARY_DIR})
     add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 endif()
 add_definitions(-DQT_USE_QSTRINGBUILDER)
 
 add_definitions( -DQT_NO_CAST_FROM_ASCII )
 add_definitions( -DQT_NO_CAST_TO_ASCII )
 
 add_subdirectory(composereditorwebengine)
 
 add_subdirectory( src )
 add_subdirectory( icons )
 add_subdirectory(kconf_update)
 
 install( FILES blogilo.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
 
 if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
     feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 endif()
diff --git a/grantleeeditor/CMakeLists.txt b/grantleeeditor/CMakeLists.txt
index f1b2e45ad8..f33a4bc39a 100644
--- a/grantleeeditor/CMakeLists.txt
+++ b/grantleeeditor/CMakeLists.txt
@@ -1,90 +1,90 @@
 project(grantleeditor)
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${grantleeditor_SOURCE_DIR})
     cmake_minimum_required(VERSION 3.1)
     set(KF5_VERSION "5.23.0")
     find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE)
     set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
     include(ECMInstallIcons)
 
     include(ECMOptionalAddSubdirectory)
     include(ECMSetupVersion)
     include(ECMAddTests)
     include(ECMMarkNonGuiExecutable)
     include(GenerateExportHeader)
     include(ECMGenerateHeaders)
     include(CMakePackageConfigHelpers)
     include(FeatureSummary)
     include(CheckFunctionExists)
     include(ECMGeneratePriFile)
 
     include(KDEInstallDirs)
     include(KDECMakeSettings)
     include(KDECompilerSettings NO_POLICY_SCOPE)
     include(ECMAddAppIcon)
     include(ECMQtDeclareLoggingCategory)
 
     # Do NOT add quote
     set(KDEPIM_DEV_VERSION beta1)
 
     # add an extra space
     if(DEFINED KDEPIM_DEV_VERSION)
         set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
     endif()
 
 
     set(KDEPIM_VERSION_NUMBER "5.2.80")
     set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
 
-    set(MESSAGELIB_LIB_VERSION_LIB "5.2.90")
+    set(MESSAGELIB_LIB_VERSION_LIB "5.2.91")
     set(AKONADI_MIMELIB_VERSION "5.2.80")
     set(KPIMTEXTEDIT_LIB_VERSION "5.2.80")
     set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
     set(KDEPIM_LIB_SOVERSION "5")
     set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.80")
     set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.2.80")
     set(LIBKLEO_LIB_VERSION_LIB "5.2.80")
     set(QT_REQUIRED_VERSION "5.6.0")
     find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets WebEngine WebEngineWidgets)
 
     set(PIMCOMMON_LIB_VERSION_LIB "5.2.80")
     set(LIBKDEPIM_LIB_VERSION_LIB "5.2.80")
     # Find KF5 package
     find_package(KF5Crash ${KF5_VERSION} REQUIRED)
     find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5DocTools ${KF5_VERSION} REQUIRED)
     find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5TextEditor ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5NewStuff ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5PimCommon ${PIMCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5GrantleeTheme ${LIBGRANTLEETHEME_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5AkonadiMime ${AKONADI_MIMELIB_VERSION} CONFIG REQUIRED)
     find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION_LIB} CONFIG REQUIRED)
 
     # Find KdepimLibs Package
     find_package(KF5KaddressbookGrantlee ${KDEPIM_APPS_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED)
     add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 endif()
 
 add_definitions(-DQT_USE_QSTRINGBUILDER)
 include_directories(${grantleeditor_SOURCE_DIR} ${grantleeditor_BINARY_DIR})
 
 add_definitions( -DQT_NO_CAST_FROM_ASCII )
 add_definitions( -DQT_NO_CAST_TO_ASCII )
 
 configure_file(grantleeeditor-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/grantleeeditor-version.h @ONLY)
 
 add_subdirectory(headerthemeeditor)
 add_subdirectory(contactthemeeditor)
 add_subdirectory(grantleethemeeditor)
 add_subdirectory(contactprintthemeeditor)
 
 install( FILES grantleeditor.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
 
 if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
     feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 endif()
diff --git a/importwizard/CMakeLists.txt b/importwizard/CMakeLists.txt
index 005e792bbe..d145a7dc2d 100644
--- a/importwizard/CMakeLists.txt
+++ b/importwizard/CMakeLists.txt
@@ -1,93 +1,93 @@
 project(importwizard)
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${importwizard_SOURCE_DIR})
     cmake_minimum_required(VERSION 3.1)
     set(KF5_VERSION "5.23.0")
     find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE)
     set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
     include(ECMInstallIcons)
 
     include(ECMOptionalAddSubdirectory)
     include(ECMSetupVersion)
     include(ECMAddTests)
     include(ECMMarkNonGuiExecutable)
     include(GenerateExportHeader)
     include(ECMGenerateHeaders)
     include(CMakePackageConfigHelpers)
     include(FeatureSummary)
     include(CheckFunctionExists)
     include(ECMGeneratePriFile)
 
     include(KDEInstallDirs)
     include(KDECMakeSettings)
     include(KDECompilerSettings NO_POLICY_SCOPE)
     include(ECMAddAppIcon)
     include(ECMQtDeclareLoggingCategory)
 
     # Do NOT add quote
     set(KDEPIM_DEV_VERSION beta1)
 
     # add an extra space
     if(DEFINED KDEPIM_DEV_VERSION)
         set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
     endif()
 
 
 
     set(KDEPIM_VERSION_NUMBER "5.2.80")
     set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
 
 
     set(KMAILTRANSPORT_LIB_VERSION "5.2.80")
     set(AKONADI_VERSION "5.2.80")
 
     set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
     set(KDEPIM_LIB_SOVERSION "5")
 
     set(QT_REQUIRED_VERSION "5.6.0")
     find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Gui)
     set(LIBMAILIMPORTER_VERSION_LIB "5.2.80")
     set(MAILCOMMON_LIB_VERSION_LIB "5.2.80")
-    set(MESSAGELIB_LIB_VERSION_LIB "5.2.90")
+    set(MESSAGELIB_LIB_VERSION_LIB "5.2.91")
     set(PIMCOMMON_LIB_VERSION_LIB "5.2.80")
     set(LIBKDEPIM_LIB_VERSION_LIB "5.2.80")
     set(IDENTITYMANAGEMENT_LIB_VERSION "5.2.80")
     set(KCONTACTS_LIB_VERSION "5.2.81")
 
     # Find KF5 package
     find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Auth ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5DocTools ${KF5_VERSION} REQUIRED)
     find_package(KF5Crash ${KF5_VERSION} REQUIRED)
 
     # Find KdepimLibs Package
     find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
     find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5IdentityManagement ${IDENTITYMANAGEMENT_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5MailTransport ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED)
 
 
     find_package(KF5MailCommon ${MAILCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5MailImporter ${LIBMAILIMPORTER_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5PimCommon ${PIMCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5MessageComposer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
     include_directories(${importwizard_SOURCE_DIR} ${importwizard_BINARY_DIR})
     add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 endif()
 
 add_definitions(-DQT_USE_QSTRINGBUILDER)
 include_directories(
     ${importwizard_SOURCE_DIR}/src/autodetect/
     )
 
 add_subdirectory(src)
 
 install( FILES importwizard.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
 
 if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
     feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 endif()
diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt
index 085bc04e96..9797825c1f 100644
--- a/kmail/CMakeLists.txt
+++ b/kmail/CMakeLists.txt
@@ -1,158 +1,158 @@
 project(kmail)
 
 include(CheckIncludeFiles)
 
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${kmail_SOURCE_DIR})
     cmake_minimum_required(VERSION 3.1)
     if (POLICY CMP0063)
         cmake_policy(SET CMP0063 NEW)
     endif()
     set(KF5_VERSION "5.23.0")
     find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE)
     set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
     include(ECMOptionalAddSubdirectory)
     include(ECMInstallIcons)
     include(ECMSetupVersion)
     include(ECMAddTests)
     include(ECMMarkNonGuiExecutable)
     include(GenerateExportHeader)
     include(ECMGenerateHeaders)
     include(CMakePackageConfigHelpers)
     include(FeatureSummary)
     include(CheckFunctionExists)
     include(ECMGeneratePriFile)
 
     include(KDEInstallDirs)
     include(KDECMakeSettings)
     include(KDECompilerSettings NO_POLICY_SCOPE)
     include(ECMAddAppIcon)
     include(ECMQtDeclareLoggingCategory)
 
     # Do NOT add quote
     set(KDEPIM_DEV_VERSION beta1)
 
     # add an extra space
     if(DEFINED KDEPIM_DEV_VERSION)
         set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
     endif()
 
     set(KDEPIM_VERSION_NUMBER "5.2.80")
     set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
 
 
     set(AKONADI_MIMELIB_VERSION "5.2.80")
     set(AKONADI_CONTACT_VERSION "5.2.80")
     set(KCONTACTS_LIB_VERSION "5.2.81")
     set(KCALENDARCORE_LIB_VERSION "5.2.80")
     set(CALENDARUTILS_LIB_VERSION "5.2.80")
     set(IDENTITYMANAGEMENT_LIB_VERSION "5.2.80")
     set(KLDAP_LIB_VERSION "5.2.80")
     set(KMAILTRANSPORT_LIB_VERSION "5.2.80")
     set(GPGMEPP_LIB_VERSION "5.2.80")
     set(KONTACTINTERFACE_LIB_VERSION "5.2.80")
     set(KMIME_LIB_VERSION "5.2.80")
     set(KPIMTEXTEDIT_LIB_VERSION "5.2.80")
     set(AKONADI_VERSION "5.2.80")
 
     set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
     set(KDEPIM_LIB_SOVERSION "5")
 
     set(QT_REQUIRED_VERSION "5.6.0")
     option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE)
     find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widgets WebEngine WebEngineWidgets Xml)
     set(LIBGRAVATAR_VERSION_LIB "5.2.80")
     set(MAILCOMMON_LIB_VERSION_LIB "5.2.80")
     set(KDEPIM_APPS_LIB_VERSION_LIB "5.2.80")
-    set(MESSAGELIB_LIB_VERSION_LIB "5.2.90")
+    set(MESSAGELIB_LIB_VERSION_LIB "5.2.91")
     set(LIBKLEO_LIB_VERSION_LIB "5.2.80")
     set(PIMCOMMON_LIB_VERSION_LIB "5.2.80")
     set(LIBKDEPIM_LIB_VERSION_LIB "5.2.80")
     set(LIBKSIEVE_LIB_VERSION_LIB "5.2.82")
 
     find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
     set(WEBENGINE_TYPE "QtWebEngine")
 
     find_package(KF5AkonadiSearch "5.2.80" CONFIG REQUIRED)
     set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "http://www.kde.org" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi")
 
     # Find KF5 package
     find_package(KF5Crash ${KF5_VERSION} REQUIRED)
 
     find_package(KF5Bookmarks ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Codecs ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5ConfigWidgets ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Crash ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5DocTools ${KF5_VERSION} REQUIRED)
     find_package(KF5GuiAddons ${KF5_VERSION} REQUIRED)
     find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5ItemViews ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5JobWidgets ${KF5_VERSION} REQUIRED)
     find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5KCMUtils ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Notifications ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5NotifyConfig ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Parts ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Service ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5Sonnet ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5TextWidgets ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5WidgetsAddons ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5WindowSystem ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED)
 
     # Find KdepimLibs Package
     find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
     find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED)
     find_package(KF5AkonadiMime ${AKONADI_MIMELIB_VERSION} CONFIG REQUIRED)
     find_package(KF5Contacts ${KCONTACTS_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5CalendarCore ${KCALENDARCORE_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5CalendarUtils ${CALENDARUTILS_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5IdentityManagement ${IDENTITYMANAGEMENT_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5Ldap ${KLDAP_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5MailTransport ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
 
     find_package(KF5Gpgmepp ${GPGMEPP_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5KontactInterface ${KONTACTINTERFACE_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
 
     find_package(KF5FollowupReminder ${KDEPIM_APPS_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5Gravatar ${LIBGRAVATAR_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5KdepimDBusInterfaces ${KDEPIM_APPS_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5LibKSieve ${LIBKSIEVE_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5MailCommon ${MAILCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5MessageCore ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5MessageComposer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5MessageList ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5PimCommon ${PIMCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5SendLater ${KDEPIM_APPS_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5TemplateParser ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(MailTransportDBusService CONFIG REQUIRED)
 
     find_package(Boost 1.34.0)
     set_package_properties(Boost PROPERTIES DESCRIPTION "Boost C++ Libraries" URL "http://www.boost.org" TYPE REQUIRED PURPOSE "Boost is required for building most KDEPIM applications")
     add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 endif()
 add_definitions(-DQT_USE_QSTRINGBUILDER)
 configure_file(config-enterprise.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-enterprise.h )
 
 include_directories(${kmail_SOURCE_DIR} ${kmail_BINARY_DIR})
 configure_file(kmail-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kmail-version.h @ONLY)
 
 add_definitions( -DQT_NO_CAST_FROM_ASCII )
 add_definitions( -DQT_NO_CAST_TO_ASCII )
 
 add_subdirectory(src)
 add_subdirectory(agents)
 
 install( FILES kmail.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
 
 if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
     feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 endif()
 
diff --git a/sieveeditor/CMakeLists.txt b/sieveeditor/CMakeLists.txt
index bdff622303..85e8c42c68 100644
--- a/sieveeditor/CMakeLists.txt
+++ b/sieveeditor/CMakeLists.txt
@@ -1,82 +1,82 @@
 project( sieveeditor )
 if(${CMAKE_SOURCE_DIR} STREQUAL ${sieveeditor_SOURCE_DIR})
     cmake_minimum_required(VERSION 3.1)
     set(KF5_VERSION "5.23.0")
     find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE)
     set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
     include(ECMInstallIcons)
 
     include(ECMOptionalAddSubdirectory)
     include(ECMSetupVersion)
     include(ECMAddTests)
     include(ECMMarkNonGuiExecutable)
     include(GenerateExportHeader)
     include(ECMGenerateHeaders)
     include(CMakePackageConfigHelpers)
     include(FeatureSummary)
     include(CheckFunctionExists)
     include(ECMGeneratePriFile)
 
     include(KDEInstallDirs)
     include(KDECMakeSettings)
     include(KDECompilerSettings NO_POLICY_SCOPE)
     include(ECMAddAppIcon)
     include(ECMQtDeclareLoggingCategory)
 
     # Do NOT add quote
     set(KDEPIM_DEV_VERSION beta1)
 
     # add an extra space
     if(DEFINED KDEPIM_DEV_VERSION)
         set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
     endif()
 
 
     set(KDEPIM_VERSION_NUMBER "5.2.80")
     set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
 
     set(KMAILTRANSPORT_LIB_VERSION "5.2.80")
     set(KPIMTEXTEDIT_LIB_VERSION "5.2.80")
 
     set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
     set(KDEPIM_LIB_SOVERSION "5")
 
-    set(MESSAGELIB_LIB_VERSION_LIB "5.2.90")
+    set(MESSAGELIB_LIB_VERSION_LIB "5.2.91")
     set(PIMCOMMON_LIB_VERSION_LIB "5.2.80")
     set(LIBKSIEVE_LIB_VERSION_LIB "5.2.82")
 
     set(QT_REQUIRED_VERSION "5.6.0")
     find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Network Test)
 
     # Find KF5 package
     find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
     find_package(KF5DocTools ${KF5_VERSION} REQUIRED)
     find_package(KF5Crash ${KF5_VERSION} REQUIRED)
 
     # Find KdepimLibs Package
     find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
     find_package(KF5MailTransport ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED)
 
     find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5PimCommon ${PIMCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
     find_package(KF5LibKSieve ${LIBKSIEVE_LIB_VERSION_LIB} CONFIG REQUIRED)
 
     include_directories(${sieveeditor_SOURCE_DIR} ${sieveeditor_BINARY_DIR})
     add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 
 endif()
 add_definitions(-DQT_USE_QSTRINGBUILDER)
 add_definitions( -DQT_NO_CAST_FROM_ASCII )
 add_definitions( -DQT_NO_CAST_TO_ASCII )
 
 add_subdirectory(src)
 if (BUILD_TESTING)
     add_subdirectory(autotests)
 endif()
 
 install( FILES sieveeditor.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
 
 if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
     feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 endif()