diff --git a/.travis.yml b/.travis.yml
index 660b22bbe..b8ab4952b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -93,20 +93,20 @@ cache:
   - app/node_modules
   - /tmp/mailsync-build-deps
 
-after_success:
-# Grab the version number from the .deb product and update the snapcraft.yml file
-- sed "s/MAILSPRING_VERSION/$(grep -E -o '([0-9]+.[0-9]+.[0-9]+)' <<< "$(find app/dist -type f -name mailspring-*.deb)")/g" snap/snapcraft.template.yaml > snap/snapcraft.yaml
-# Decrypt the snapcraft login information
-- openssl aes-256-cbc -K $encrypted_f8421d18d2b7_key -iv $encrypted_f8421d18d2b7_iv
-  -in .snapcraft/travis_snapcraft.cfg -out .snapcraft/snapcraft.cfg -d
+# after_success:
+# # Grab the version number from the .deb product and update the snapcraft.yml file
+# - sed "s/MAILSPRING_VERSION/$(grep -E -o '([0-9]+.[0-9]+.[0-9]+)' <<< "$(find app/dist -type f -name mailspring-*.deb)")/g" snap/snapcraft.template.yaml > snap/snapcraft.yaml
+# # Decrypt the snapcraft login information
+# - openssl aes-256-cbc -K $encrypted_f8421d18d2b7_key -iv $encrypted_f8421d18d2b7_iv
+#   -in .snapcraft/travis_snapcraft.cfg -out .snapcraft/snapcraft.cfg -d
 
-services:
-- docker
+# services:
+# - docker
 
-deploy:
-  'on':
-    branch: master
-    condition: $TRAVIS_OS_NAME = linux
-  provider: script
-  script: docker run -v $(pwd):$(pwd) -t snapcore/snapcraft sh -c "apt update -qq && cd $(pwd) && snapcraft && snapcraft push *.snap --release edge"
-  skip_cleanup: true
+# deploy:
+#   'on':
+#     branch: master
+#     condition: $TRAVIS_OS_NAME = linux
+#   provider: script
+#   script: docker run -v $(pwd):$(pwd) -t snapcore/snapcraft sh -c "apt update -qq && cd $(pwd) && snapcraft && snapcraft push *.snap --release edge"
+#   skip_cleanup: true
diff --git a/mailsync b/mailsync
index 383234e35..6c51f2ff4 160000
--- a/mailsync
+++ b/mailsync
@@ -1 +1 @@
-Subproject commit 383234e35ae1fe0366fbefc4c035b8b8f28bb5e6
+Subproject commit 6c51f2ff4420e44ac78d27a105eadbe758fd81cb