diff --git a/kube/com.kubeproject.kube.experimental.json b/kube/com.kubeproject.kube.experimental.json
index ca7986f..9152a7d 100644
--- a/kube/com.kubeproject.kube.experimental.json
+++ b/kube/com.kubeproject.kube.experimental.json
@@ -1,49 +1,49 @@
 {
     "id": "com.kubeproject.kube",
     "branch": "experimental",
     "runtime": "org.freedesktop.Platform",
     "runtime-version": "1.6",
     "sdk": "org.freedesktop.Sdk",
     "command": "kubewrapper.sh",
     "rename-icon": "kube_icon",
     "desktop-file-name-prefix": "(Experimental Nightly) ",
     "tags": ["nightly", "experimental"],
     "finish-args": [
         "--share=ipc",
         "--socket=x11",
         "--socket=wayland",
         "--device=dri",
         "--filesystem=host",
         "--filesystem=/tmp",
         "--share=network",
-        "--env=SASL_PATH=/usr/lib/sasl2/"
+        "--env=SASL_PATH=/app/lib/sasl2/"
     ],
     "separate-locales": false,
     "modules": [
         "kubedeps.json",
         {
             "config-opts": ["-DCMAKE_INSTALL_LIBDIR=lib"],
             "name": "sink",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/sink.git", "branch": "develop" } ]
         },
         {
             "config-opts": [
                 "-DCMAKE_INSTALL_LIBDIR=lib",
                 "-DCMAKE_C_COMPILER=/usr/bin/clang",
                 "-DCMAKE_CXX_COMPILER=/usr/bin/clang++",
                 "-DKUBE_APPLICATION_ID=com.kubeproject.kube",
                 "-DEXPERIMENTAL_VIEWS=ON",
                 "-DENABLE_EXTENSIONS=ON"
             ],
             "name": "kube",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kube.git", "branch": "develop" } ],
             "post-install": [
                 "rm -rf /app/include",
                 "rm -rf /app/lib/*.la /app/lib/*.a /app/lib/*.prl "
             ]
         },
         "wrapperscript.json"
     ]
 }
diff --git a/kube/kubedeps.json b/kube/kubedeps.json
index 0dc9781..bebca8a 100644
--- a/kube/kubedeps.json
+++ b/kube/kubedeps.json
@@ -1,83 +1,89 @@
 {
     "name": "kubedeps",
     "modules": [
         "qt.json",
         "boost.json",
         "gpgme.json",
         {
             "config-opts": ["-DCMAKE_INSTALL_LIBDIR=lib"],
             "name": "kasync",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kasync.git", "branch": "master" } ]
         },
         {
             "config-opts": ["-DCMAKE_BUILD_TYPE=Release", "-DCMAKE_INSTALL_LIBDIR=lib", "-DFLATBUFFERS_BUILD_TESTS=OFF", "-DFLATBUFFERS_BUILD_FLATC=ON"],
             "name": "flatbuffers",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "https://github.com/google/flatbuffers.git", "branch": "v1.10.0" } ]
         },
         {
             "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"],
             "name": "kmime",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kmime.git", "branch": "Applications/17.04" } ]
         },
         {
             "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"],
             "name": "kimap2",
             "buildsystem": "cmake-ninja",
-            "sources": [ { "type": "git", "url": "git://anongit.kde.org/kimap2.git", "branch": "master" } ]
+            "sources": [ { "type": "git", "url": "git://anongit.kde.org/kimap2.git", "branch": "master" } ],
+            "modules": [
+                {
+                    "name": "cyrus-sasl",
+                    "sources": [ { "type": "git", "url": "https://github.com/cyrusimap/cyrus-sasl.git", "branch": "cyrus-sasl-2.1.27"} ]
+                }
+            ]
         },
         {
             "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"],
             "name": "kcontacts",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcontacts.git", "branch": "Applications/17.04" } ]
         },
         {
             "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"],
             "name": "libical",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "https://github.com/libical/libical.git", "branch": "v2.0.0" } ]
         },
         {
             "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"],
             "name": "kcalcore",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kcalcore.git", "branch": "v17.12.2" } ]
         },
         {
             "config-opts": ["-DENABLE_TESTING=OFF", "-DCMAKE_INSTALL_LIBDIR=lib"],
             "name": "kdav2",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "git://anongit.kde.org/kdav2.git", "branch": "master" } ]
         },
         {
             "name": "lmdb",
             "sources": [ { "type": "git", "url": "git://github.com/LMDB/lmdb.git", "branch": "LMDB_0.9.23"}],
             "no-autogen": true,
             "make-install-args": ["prefix=/app"],
             "subdir" : "libraries/liblmdb"
         },
         {
             "name": "curl",
             "buildsystem": "cmake-ninja",
             "sources": [ { "type": "git", "url": "https://github.com/curl/curl.git", "branch": "curl-7_55_0"} ]
         },
         {
             "name": "xapian",
             "sources": [
                 {
                     "type": "archive",
                     "url": "https://oligarchy.co.uk/xapian/1.4.2/xapian-core-1.4.2.tar.xz",
                     "sha256": "aec2c4352998127a2f2316218bf70f48cef0a466a87af3939f5f547c5246e1ce"
                 }
             ],
             "cleanup": [
                 "/lib/libxapian.la",
                 "/share/doc/xapian-core",
                 "/bin/xapian-*"
             ]
         }
     ]
 }