diff --git a/social/email/61-email.js b/social/email/61-email.js
index a2d4c76d..2dbfad24 100644
--- a/social/email/61-email.js
+++ b/social/email/61-email.js
@@ -447,6 +447,7 @@ module.exports = function(RED) {
         }  // End of checkEmail
 
         if (node.protocol === "IMAP") {
+            var tout = (node.repeat > 0) ? node.repeat - 500 : 15000;
             imap = new Imap({
                 user: node.userid,
                 password: node.password,
@@ -454,8 +455,8 @@ module.exports = function(RED) {
                 port: node.inport,
                 tls: node.useSSL,
                 tlsOptions: { rejectUnauthorized: false },
-                connTimeout: node.repeat - 500,
-                authTimeout: node.repeat - 500
+                connTimeout: tout,
+                authTimeout: tout
             });
             imap.on('error', function(err) {
                 if (err.errno !== "ECONNRESET") {
diff --git a/social/email/package.json b/social/email/package.json
index 8730ac0f..c2575eb2 100644
--- a/social/email/package.json
+++ b/social/email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-email",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "description": "Node-RED nodes to send and receive simple emails",
   "dependencies": {
     "imap": "^0.8.19",