diff --git a/CMakeLists.txt b/CMakeLists.txt
index 028c97ef..c26bf5cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,161 +1,161 @@
 
 cmake_minimum_required(VERSION 3.1)
 set(PIM_VERSION "5.9.2")
 
 project(kdepim-addons VERSION ${PIM_VERSION})
 if(POLICY CMP0063)
   cmake_policy(SET CMP0063 NEW)
 endif()
 
 set(KF5_VERSION "5.47.0")
 
 find_package(ECM ${KF5_VERSION} CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 
 # Do NOT add quote
 set(KDEPIM_DEV_VERSION)
 
 # add an extra space
 if(DEFINED KDEPIM_DEV_VERSION)
   set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
 endif()
 
 set(KDEPIMADDONS_VERSION_NUMBER ${PIM_VERSION})
 set(KDEPIMADDONS_VERSION "${KDEPIMADDONS_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
 
 set(KDEPIMADDONS_LIB_VERSION "${KDEPIMADDONS_VERSION_NUMBER}")
 set(KDEPIMADDONS_LIB_SOVERSION "5")
 
-set(AKONADINOTES_LIB_VERSION "5.9.1")
+set(AKONADINOTES_LIB_VERSION "5.9.2")
 set(QT_REQUIRED_VERSION "5.9.0")
 
 include(ECMOptionalAddSubdirectory)
 include(ECMInstallIcons)
 include(ECMSetupVersion)
 include(ECMAddTests)
 include(ECMMarkNonGuiExecutable)
 include(GenerateExportHeader)
 include(ECMGenerateHeaders)
 include(CMakePackageConfigHelpers)
 include(FeatureSummary)
 include(CheckFunctionExists)
 include(ECMGeneratePriFile)
 include(ECMCoverageOption)
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMAddAppIcon)
 include(ECMQtDeclareLoggingCategory)
 
 option(KDEPIMADDONS_BUILD_EXAMPLES "Build the kdepim-addons example applications." 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)
 
 option(KMAIL_EDITORCONVERTERPLUGIN_BUILD "Build the kmail editor converter plugin." FALSE)
 
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED WebEngine WebEngineWidgets Widgets Test)
 
 find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5AkonadiNotes ${AKONADINOTES_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Declarative ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5SyntaxHighlighting ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Parts ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Prison ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Holidays ${KF5_VERSION} CONFIG REQUIRED)
 
-set(MAILCOMMON_LIB_VERSION "5.9.1")
-set(GRAVATAR_LIB_VERSION "5.9.1")
-set(PIMCOMMON_LIB_VERSION "5.9.1")
-set(GRANTLEETHEME_LIB_VERSION "5.9.1")
-set(CALENDARSUPPORT_LIB_VERSION "5.9.1")
-set(EVENTVIEW_LIB_VERSION "5.9.1")
-set(LIBKDEPIM_LIB_VERSION "5.9.1")
-set(KDEPIM_APPS_LIB_VERSION "5.9.1")
-set(LIBKLEO_LIB_VERSION "5.9.1")
-set(AKONADI_LIB_VERSION "5.9.1")
-set(INCIDENCEEDITOR_LIB_VERSION "5.9.1")
-set(KTNEF_LIB_VERSION "5.9.1")
-set(MESSAGELIB_LIB_VERSION "5.9.1")
-set(AKONADICALENDAR_LIB_VERSION "5.9.1")
-set(CALENDAR_UTILS_VERSION "5.9.1")
-set(KPIMTEXTEDIT_LIB_VERSION "5.9.1")
-set(KIMAP_LIB_VERSION "5.9.1")
-set(LIBKSIEVE_LIB_VERSION "5.9.1")
-set(KMAILTRANSPORT_LIB_VERSION "5.9.1")
-set(AKONADICONTACT_LIB_VERSION "5.9.1")
-set(IMPORTWIZARD_LIB_VERSION "5.9.1")
-set(MAILIMPORTER_LIB_VERSION "5.9.1")
-set(KPIMPKPASS_LIB_VERSION "5.9.1")
-set(KPIMITINERARY_LIB_VERSION "5.9.1")
+set(MAILCOMMON_LIB_VERSION "5.9.2")
+set(GRAVATAR_LIB_VERSION "5.9.2")
+set(PIMCOMMON_LIB_VERSION "5.9.2")
+set(GRANTLEETHEME_LIB_VERSION "5.9.2")
+set(CALENDARSUPPORT_LIB_VERSION "5.9.2")
+set(EVENTVIEW_LIB_VERSION "5.9.2")
+set(LIBKDEPIM_LIB_VERSION "5.9.2")
+set(KDEPIM_APPS_LIB_VERSION "5.9.2")
+set(LIBKLEO_LIB_VERSION "5.9.2")
+set(AKONADI_LIB_VERSION "5.9.2")
+set(INCIDENCEEDITOR_LIB_VERSION "5.9.2")
+set(KTNEF_LIB_VERSION "5.9.2")
+set(MESSAGELIB_LIB_VERSION "5.9.2")
+set(AKONADICALENDAR_LIB_VERSION "5.9.2")
+set(CALENDAR_UTILS_VERSION "5.9.2")
+set(KPIMTEXTEDIT_LIB_VERSION "5.9.2")
+set(KIMAP_LIB_VERSION "5.9.2")
+set(LIBKSIEVE_LIB_VERSION "5.9.2")
+set(KMAILTRANSPORT_LIB_VERSION "5.9.2")
+set(AKONADICONTACT_LIB_VERSION "5.9.2")
+set(IMPORTWIZARD_LIB_VERSION "5.9.2")
+set(MAILIMPORTER_LIB_VERSION "5.9.2")
+set(KPIMPKPASS_LIB_VERSION "5.9.2")
+set(KPIMITINERARY_LIB_VERSION "5.9.2")
 
 find_package(KF5CalendarUtils ${CALENDAR_UTILS_VERSION} CONFIG REQUIRED)
 find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5TemplateParser ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5MailCommon ${MAILCOMMON_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5KaddressbookGrantlee ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5KaddressbookImportExport ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5GrantleeTheme ${GRANTLEETHEME_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5PimCommonAkonadi ${PIMCOMMON_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5LibkdepimAkonadi ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5IncidenceEditor ${INCIDENCEEDITOR_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5MessageCore ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5MessageComposer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5MessageList ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5EventViews ${EVENTVIEW_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5Akonadi ${AKONADI_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5AkonadiCalendar ${AKONADICALENDAR_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5Gravatar ${GRAVATAR_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5IdentityManagement ${KIDENTITYMANAGEMENT_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5IMAP ${KIMAP_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5LibKSieve ${LIBKSIEVE_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5Tnef ${KTNEF_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5MailTransportAkonadi ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5AkonadiContact ${AKONADICONTACT_LIB_VERSION} CONFIG REQUIRED)
 find_package(KPimImportWizard ${IMPORTWIZARD_LIB_VERSION} CONFIG)
 find_package(KF5MailImporterAkonadi ${MAILIMPORTER_LIB_VERSION} CONFIG REQUIRED)
 find_package(KPimPkPass ${KPIMPKPASS_LIB_VERSION} CONFIG REQUIRED)
 find_package(KPimItinerary ${KPIMITINERARY_LIB_VERSION} CONFIG REQUIRED)
 add_definitions(-DQT_NO_CAST_FROM_ASCII)
 add_definitions(-DQT_NO_CAST_TO_ASCII)
 add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 
 if(KDEPIM_ENTERPRISE_BUILD)
   set(KDEPIM_ENTERPRISE_BUILD true)
 else()
   set(KDEPIM_ENTERPRISE_BUILD false)
 endif()
 
 # Extra package
 find_package(Gpgmepp 1.8.0 CONFIG)
 set_package_properties(Gpgmepp PROPERTIES DESCRIPTION "GpgME library" URL "http://www.gnupg.org" TYPE REQUIRED)
 
 if(KDEPIMADDONS_BUILD_EXAMPLES)
   add_subdirectory(examples)
 endif()
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 
 add_subdirectory(plugins)
 add_subdirectory(korganizer)
 add_subdirectory(kmail)
 add_subdirectory(kaddressbook)
 add_subdirectory(akregator)
 add_subdirectory(sieveeditor)
 add_subdirectory(kmailtransport)
 if(KPimImportWizard_FOUND)
   add_subdirectory(akonadi-import-wizard)
 endif()
 
 install(FILES kdepim-addons.categories kdepim-addons.renamecategories DESTINATION ${KDE_INSTALL_CONFDIR})
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)