diff --git a/.travis.yml b/.travis.yml
index 7e74bee3c..6e31337f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -77,6 +77,7 @@ before_install:
   git submodule update --init mailsync
 
 script:
+- npm run ci-setup-mac-keychain
 - mailsync/build.sh
 - mv ./mailsync ./mailsync-src
 - DEBUG=electron-packager,electron-osx-sign npm run build
diff --git a/app/build/Gruntfile.js b/app/build/Gruntfile.js
index b70229f7b..378e005ae 100644
--- a/app/build/Gruntfile.js
+++ b/app/build/Gruntfile.js
@@ -78,12 +78,11 @@ module.exports = (grunt) => {
       // The Windows electron-winstaller task must be run outside of grunt
     ]);
   } else if (grunt.option('platform') === 'darwin') {
-    const subTasks = process.env.SIGN_BUILD ? ["setup-mac-keychain"] : []
-    grunt.registerTask("build-client", subTasks.concat([
+    grunt.registerTask("build-client", [
       "package",
       "create-mac-zip",
       "create-mac-dmg",
-    ]));
+    ]);
   } else if (grunt.option('platform') === 'linux') {
     grunt.registerTask("build-client", [
       "package",
diff --git a/mailsync b/mailsync
index ca93826ad..dda1be26c 160000
--- a/mailsync
+++ b/mailsync
@@ -1 +1 @@
-Subproject commit ca93826adb2fdacc43e0626a2a69cb772aef054c
+Subproject commit dda1be26cb78aa47362c80689e0017e7dc2c5df9
diff --git a/package.json b/package.json
index 8231affc9..2dc9fae31 100644
--- a/package.json
+++ b/package.json
@@ -68,6 +68,7 @@
     "test": "app/node_modules/.bin/electron ./app --enable-logging --test",
     "test-window": "app/node_modules/.bin/electron ./app --enable-logging --test=window",
     "build": "grunt build-client --gruntfile=app/build/Gruntfile.js --base=./",
-    "build-docs": "grunt docs --gruntfile=app/build/Gruntfile.js --base=./ && mkdir -p app/dist-docs && cp README.md ./app/build/docs_src/README.md && gitbook --gitbook=latest build . ./app/dist-docs --log=debug --debug && rm ./app/build/docs_src/README.md && rm -rf ./app/build/docs_src/classes"
+    "build-docs": "grunt docs --gruntfile=app/build/Gruntfile.js --base=./ && mkdir -p app/dist-docs && cp README.md ./app/build/docs_src/README.md && gitbook --gitbook=latest build . ./app/dist-docs --log=debug --debug && rm ./app/build/docs_src/README.md && rm -rf ./app/build/docs_src/classes",
+    "ci-setup-mac-keychain": "grunt setup-mac-keychain --gruntfile=app/build/Gruntfile.js --base=./"
   }
 }