diff --git a/lib/Connection.js b/lib/Connection.js
index d0fac1fd..bd31e98b 100644
--- a/lib/Connection.js
+++ b/lib/Connection.js
@@ -117,6 +117,8 @@ Connection.prototype.connect = function() {
 
   if (config.tls) {
     tlsOptions = {};
+    // servername must be set to prevent issues with some imap server and openssl 1.1.1
+    tlsOptions.servername = config.host;
     tlsOptions.host = config.host;
     // Host name may be overridden the tlsOptions
     for (var k in config.tlsOptions)