diff --git a/.travis.yml b/.travis.yml
index d0fb025ce..4ebd1b66a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,7 +70,10 @@ before_install:
 
 script:
 # Checkout and build the (currently private) C++ codebase
-- GIT_SSH_COMMAND='ssh -i app/build/resources/certs/mailsync-deploy-key' git submodule update --init mailsync
+- GIT_SSH_COMMAND='ssh -i app/build/resources/certs/mailsync-deploy-key -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
+  SSH_ASKPASS=/Users/travis/build/Foundry376/Merani/app/build/resources/certs/ssh-askpass-fix
+  DISPLAY=nothing:0
+  git submodule update --init mailsync
 - mailsync/build.sh
 
 # Build and package the Merani Electron application
@@ -79,4 +82,5 @@ script:
 cache:
   directories:
   - node_modules
-  - app/node_modules
\ No newline at end of file
+  - app/node_modules
+  - /tmp/mailsync-build-deps
\ No newline at end of file
diff --git a/app/build/resources/certs.tar.enc b/app/build/resources/certs.tar.enc
index ca2ec769d..6991aac00 100644
Binary files a/app/build/resources/certs.tar.enc and b/app/build/resources/certs.tar.enc differ
diff --git a/mailsync b/mailsync
index 23e16aab5..2f2e2dd60 160000
--- a/mailsync
+++ b/mailsync
@@ -1 +1 @@
-Subproject commit 23e16aab5f5c9b3e8dade62246365067c1143f99
+Subproject commit 2f2e2dd600191449aab3924c9988c814b8ff8303