diff --git a/Gruntfile.js b/Gruntfile.js
index fdfc7a0..8cbfb58 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -316,6 +316,13 @@ module.exports = function(grunt) {
                 src: ['openpgp/openpgp.js', 'openpgp/openpgp.worker.js', 'forge/forge.min.js'],
                 dest: 'dist/js/'
             },
+            tls: {
+                expand: true,
+                flatten: true,
+                cwd: 'node_modules/tcp-socket/src/',
+                src: ['tcp-socket-tls-worker.js', 'tcp-socket-tls.js'],
+                dest: 'dist/js/'
+            },
             font: {
                 expand: true,
                 cwd: 'src/font/',
diff --git a/src/js/app-controller.js b/src/js/app-controller.js
index 8cd86c8..e768105 100644
--- a/src/js/app-controller.js
+++ b/src/js/app-controller.js
@@ -226,6 +226,9 @@ ctrl.onConnect = function(callback) {
         // add the maximum update batch size for imap folders to the imap configuration
         credentials.imap.maxUpdateSize = config.imapUpdateBatchSize;
 
+        // tls socket worker path for multithreaded tls in non-native tls environments
+        credentials.imap.tlsWorkerPath = credentials.smtp.tlsWorkerPath = config.workerPath + '/tcp-socket-tls-worker.js';
+
         var pgpMailer = new PgpMailer(credentials.smtp, ctrl._pgpbuilder);
         var imapClient = new ImapClient(credentials.imap);
         imapClient.onError = onConnectionError;