diff --git a/social/email/61-email.html b/social/email/61-email.html
index e0c14c72..993a9eaa 100644
--- a/social/email/61-email.html
+++ b/social/email/61-email.html
@@ -126,6 +126,14 @@
         <label for="node-input-useSSL"><i class="fa fa-lock"></i> <span data-i18n="email.label.useSSL"></span></label>
         <input type="checkbox" id="node-input-useSSL" style="width: auto;">
     </div>
+    <div class="form-row">
+        <label for="node-input-autotls"><i class="fa fa-lock"></i> <span data-i18n="email.label.autotls"></label>
+ 	<select type="text" id="node-input-autotls" style="width: 150px;">
+            <option value="never" data-i18n="email.label.never">never</option>
+            <option value="always" data-i18n="email.label.always">always</option>
+            <option value="required" data-i18n="email.label.required">required</option>
+	</select>  
+    </div>
     <div class="form-row">
         <label for="node-input-server"><i class="fa fa-globe"></i> <span data-i18n="email.label.server"></span></label>
         <input type="text" id="node-input-server" placeholder="imap.gmail.com">
@@ -202,10 +210,12 @@
         $("#node-input-protocol").change(function() {
             var protocol = $("#node-input-protocol").val();
             if (protocol === "IMAP") {
+                $(".node-input-autotls").show();
                 $(".node-input-box").show();
                 $(".node-input-disposition").show();
                 $(".node-input-criteria").show();
             } else {
+                $(".node-input-autotls").hide();
                 $(".node-input-box").hide();
                 $(".node-input-disposition").hide();
                 $(".node-input-criteria").hide();
@@ -225,6 +235,7 @@
             protocol: {value: "IMAP", required:true}, // Which protocol to use to connect to the mail server ("IMAP" or "POP3")
             server: {value:"imap.gmail.com",required:true},
             useSSL: {value: true},
+            autotls: {value: "never"},
             port: {value:"993",required:true},
             box: {value:"INBOX"}, // For IMAP, The mailbox to process
             disposition: { value: "Read" }, // For IMAP, the disposition of the read email
diff --git a/social/email/61-email.js b/social/email/61-email.js
index b4a51385..c68e6ac8 100644
--- a/social/email/61-email.js
+++ b/social/email/61-email.js
@@ -189,6 +189,7 @@ module.exports = function(RED) {
         this.inport = n.port || (globalkeys && globalkeys.port) || "993";
         this.box = n.box || "INBOX";
         this.useSSL= n.useSSL;
+        this.autotls= n.autotls;
         this.protocol = n.protocol || "IMAP";
         this.disposition = n.disposition || "None"; // "None", "Delete", "Read"
         this.criteria = n.criteria || "UNSEEN"; // "ALL", "ANSWERED", "FLAGGED", "SEEN", "UNANSWERED", "UNFLAGGED", "UNSEEN"
@@ -491,6 +492,7 @@ module.exports = function(RED) {
                 host: node.inserver,
                 port: node.inport,
                 tls: node.useSSL,
+                autotls: node.autotls,
                 tlsOptions: { rejectUnauthorized: false },
                 connTimeout: tout,
                 authTimeout: tout
diff --git a/social/email/locales/de/61-email.html b/social/email/locales/de/61-email.html
index 523a3a5e..88797203 100644
--- a/social/email/locales/de/61-email.html
+++ b/social/email/locales/de/61-email.html
@@ -52,6 +52,7 @@
 }
 </pre>
 <p><b>Hinweis</b>: Bei POP3 sind die Standard-Portnummern 110 für ungesichertes TCP und 995 für SSL. Bei IMAP 143 für ungesichertes TCP und 993 für SSL.</p>
+<p><b>Hinweis</b>: Mit der Option 'STARTTLS' kann eine bestehende ungesicherte Verbindung zu einer gesicherten geupgraded werden. Die Einstellung 'immer' versucht dies immer, 'wenn erforderlich' wenn es erforderlich ist, und 'nie' gar nicht.</p>
 <p><b>Hinweis</b>: Das maximale Aktualisierungsintervall ist 2147483 Sekunden (24,8 Tage).</p>
 
 </script>
diff --git a/social/email/locales/de/61-email.json b/social/email/locales/de/61-email.json
index f990b48f..6d4b87a4 100644
--- a/social/email/locales/de/61-email.json
+++ b/social/email/locales/de/61-email.json
@@ -16,6 +16,10 @@
             "folder": "Verzeichnis",
             "protocol": "Protokoll",
             "useSSL": "SSL",
+            "autotls": "STARTTLS?",
+            "never": "nie",
+            "required": "wenn erforderlich",
+            "always": "immer",
             "useTLS": "TLS",
             "disposition": "Behandlung",
             "none": "Keine",
diff --git a/social/email/locales/en-US/61-email.html b/social/email/locales/en-US/61-email.html
index 9fd86047..959058f1 100644
--- a/social/email/locales/en-US/61-email.html
+++ b/social/email/locales/en-US/61-email.html
@@ -48,6 +48,7 @@
 }
 </pre>
 <p><b>Note</b>: For POP3, the default port numbers are 110 for plain TCP and 995 for SSL.  For IMAP the port numbers are 143 for plain TCP and 993 for SSL.</p>
+<p><b>Note</b>: With option 'STARTTLS' an established plain connection is upgraded to an encrypted one. Set to 'always' to always attempt connection upgrades via STARTTLS, 'required' only if upgrading is required, or 'never' to never attempt upgrading.</p>
 <p><b>Note</b>: The maximum refresh interval is 2147483 seconds (24.8 days).</p>
 
 </script>
diff --git a/social/email/locales/en-US/61-email.json b/social/email/locales/en-US/61-email.json
index 606580b7..7d22c313 100644
--- a/social/email/locales/en-US/61-email.json
+++ b/social/email/locales/en-US/61-email.json
@@ -16,6 +16,7 @@
             "folder": "Folder",
             "protocol": "Protocol",
             "useSSL": "Use SSL?",
+            "autotls": "STARTTLS?",
             "useTLS": "Use TLS?",
             "disposition": "Disposition",
             "none": "None",