diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..791aa3a48
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "mailsync"]
+	path = mailsync
+	url = git@github.com:Foundry376/Merani-Mailsync.git
diff --git a/.travis.yml b/.travis.yml
index ade1d4242..c15fde588 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,8 @@
 sudo: false
 
+git:
+  submodules: false
+
 language: node_js
 
 node_js:
@@ -11,6 +14,7 @@ addons:
     target_paths: client/${TRAVIS_COMMIT:0:8}/${TRAVIS_OS_NAME}
     permissions: public-read
     paths:
+    - ../MailSync
     - Merani.dmg
     - Merani.zip
     - $(find . -type f -name *.deb | tr "\n" ":")
@@ -52,6 +56,11 @@ before_install:
 - source app/build/resources/certs/mac/set_unix_env.sh;
 
 script:
+# Checkout and build the (currently private) C++ codebase
+- GIT_SSH_COMMAND='ssh -i app/build/resources/mailsync-deploy-key' git submodule update mailsync
+- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then xcodebuild -scheme MailSync -configuration Release; fi
+- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then echo "TODO"; fi
+# Build and package the Merani Electron application
 - npm run build
 
 cache:
diff --git a/app/build/resources/certs.tar.enc b/app/build/resources/certs.tar.enc
index 686ccf185..b19d3ebf8 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
new file mode 160000
index 000000000..224bb2c43
--- /dev/null
+++ b/mailsync
@@ -0,0 +1 @@
+Subproject commit 224bb2c43dd312fd722f90d96c6fe6f164f938ba