diff --git a/3rdparty/ext_applications/CMakeLists.txt b/3rdparty/ext_applications/CMakeLists.txt
index 45133c178..1d45559d3 100644
--- a/3rdparty/ext_applications/CMakeLists.txt
+++ b/3rdparty/ext_applications/CMakeLists.txt
@@ -1,63 +1,65 @@
 set(EXTPREFIX_applications "${EXTPREFIX}")
 
 ExternalProject_Add(
     ext_akonadi
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
     URL https://download.kde.org/stable/applications/17.12.3/src/akonadi-17.12.3.tar.xz
     URL_MD5 92f1aa77da4e51acab138f686e693b93
+
+    PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/akonadi.diff
     INSTALL_DIR ${EXTPREFIX_applications}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_applications}
                -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
                 ${GLOBAL_PROFILE}
                 -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
                 -DBUILD_TESTING=false
     UPDATE_COMMAND ""
     DEPENDS ext_boost ext_xslt ext_kcompletion ext_kconfig ext_kconfigwidgets ext_kcoreaddons ext_kdbusaddons ext_ki18n ext_kiconthemes ext_kitemmodels ext_kitemviews ext_kio ext_kwidgetsaddons ext_kwindowsystem ext_kxmlgui ext_kcrash
 )
 
 ExternalProject_Add(
     ext_kpimtextedit
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
     URL https://download.kde.org/stable/applications/17.12.3/src/kpimtextedit-17.12.3.tar.xz
     URL_MD5 8d7d128e5eadbf1a0022a134a00420e6
     INSTALL_DIR ${EXTPREFIX_applications}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_applications}
                -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
                 ${GLOBAL_PROFILE}
                 -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
                 -DBUILD_TESTING=false
     UPDATE_COMMAND ""
     DEPENDS ext_kcodecs ext_kconfig ext_kconfigwidgets ext_kcoreaddons ext_kemoticons ext_ki18n ext_kiconthemes ext_kio ext_sonnet ext_syntaxhighlighting ext_kwidgetsaddons ext_kxmlgui ext_grantlee
 )
 
 ExternalProject_Add(
     ext_kidentitymanagement
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
     URL https://download.kde.org/stable/applications/17.12.3/src/kidentitymanagement-17.12.3.tar.xz
     URL_MD5 4cd6e2ddfbe9a07e7916b27ac7a468dc
     INSTALL_DIR ${EXTPREFIX_applications}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_applications}
                -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
                 ${GLOBAL_PROFILE}
                 -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
                 -DBUILD_TESTING=false
     UPDATE_COMMAND ""
     DEPENDS ext_kcoreaddons ext_kcompletion ext_ktextwidgets ext_kxmlgui ext_kio ext_kconfig ext_kcodecs ext_kiconthemes ext_kpimtextedit
 )
 
 ExternalProject_Add(
     ext_kcontacts
     DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
     URL https://download.kde.org/stable/applications/17.12.3/src/kcontacts-17.12.3.tar.xz
     URL_MD5 bbfbc05509e92cac07ffb4ffee05c9ee
     INSTALL_DIR ${EXTPREFIX_applications}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_applications}
                -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE}
                 ${GLOBAL_PROFILE}
                 -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX}
                 -DBUILD_TESTING=false
     UPDATE_COMMAND ""
     DEPENDS ext_kcoreaddons ext_ki18n ext_kconfig ext_kcodecs
 )
 
 
diff --git a/3rdparty/ext_applications/akonadi.diff b/3rdparty/ext_applications/akonadi.diff
new file mode 100644
index 000000000..135eda58d
--- /dev/null
+++ b/3rdparty/ext_applications/akonadi.diff
@@ -0,0 +1,11 @@
+diff -ruN akonadi-17.12.3.orig/src/widgets/manageaccountwidget.cpp akonadi-17.12.3/src/widgets/manageaccountwidget.cpp
+--- akonadi-17.12.3.orig/src/widgets/manageaccountwidget.cpp	2018-03-05 11:14:26.000000000 +0100
++++ akonadi-17.12.3/src/widgets/manageaccountwidget.cpp	2018-09-09 08:05:30.093858293 +0200
+@@ -32,6 +32,7 @@
+ #include <KWindowSystem>
+ #include <QKeyEvent>
+ #include <QAbstractItemDelegate>
++#include <QAbstractItemView>
+ 
+ using namespace Akonadi;
+