diff --git a/social/email/61-email.html b/social/email/61-email.html
index b678a0eb..b34baf13 100644
--- a/social/email/61-email.html
+++ b/social/email/61-email.html
@@ -173,18 +173,18 @@
         </select>
     </div>
     <div class="form-row">
-        <label for="node-input-criteria"><i class="fa fa-criteria"></i> <span data-i18n="node-red:common.label.criteria"></span></label>
+        <label for="node-input-criteria"><i class="fa fa-search"></i> <span data-i18n="email.label.criteria"></span></label>
         <select type="text" id="node-input-criteria">
-            <option value="ALL" selected="selected" data-i18n="email.label.all"></option>
+            <option value="ALL" data-i18n="email.label.all"></option>
             <option value="ANSWERED" data-i18n="email.label.answered"></option>
             <option value="FLAGGED" data-i18n="email.label.flagged"></option>
-            <option value="SEEN" selected="selected" data-i18n="email.label.seen"></option>
-            <option value="UNANSWERED" selected="selected" data-i18n="email.label.unanswered"></option>
-            <option value="UNFLAGGED" selected="selected" data-i18n="email.label.unflagged"></option>
-            <option value="UNSEEN" data-i18n="email.label.unseen"></option>
+            <option value="SEEN" data-i18n="email.label.seen"></option>
+            <option value="UNANSWERED" data-i18n="email.label.unanswered"></option>
+            <option value="UNFLAGGED" data-i18n="email.label.unflagged"></option>
+            <option value="UNSEEN" selected="selected" data-i18n="email.label.unseen"></option>
             <!--
             <option value="DELETED" data-i18n="email.label.delete"></option>
-            <option value="DRAFT" selected="selected" data-i18n="email.label.none"></option>
+            <option value="DRAFT" data-i18n="email.label.none"></option>
             <option value="NEW" data-i18n="email.label.delete"></option>
             <option value="UNDELETED" data-i18n="email.label.read"></option>
             <option value="UNDRAFT" data-i18n="email.label.delete"></option>
@@ -309,6 +309,10 @@
                 $("#node-input-box").val("INBOX");
                 this.box = "INBOX";
             }
+            if (typeof this.criteria === 'undefined') {
+                $("#node-input-criteria").val("UNSEEN");
+                this.criteria = "UNSEEN";
+            }
             if ($("#node-input-fetch").val() === null) { $("#node-input-fetch").val("auto"); }
             $("#node-input-fetch").change(function() {
                 if ($("#node-input-fetch").val() === "trigger") {
diff --git a/social/email/61-email.js b/social/email/61-email.js
index 2ae4206e..acf8ebd9 100644
--- a/social/email/61-email.js
+++ b/social/email/61-email.js
@@ -344,7 +344,7 @@ module.exports = function(RED) {
                         return;
                     }
                     else {
-                        imap.search([ this.criteria ], function(err, results) {
+                        imap.search([ node.criteria ], function(err, results) {
                             if (err) {
                                 node.status({fill:"red", shape:"ring", text:"email.status.foldererror"});
                                 node.error(RED._("email.errors.fetchfail", {folder:node.box}),err);
diff --git a/social/email/package-lock.json b/social/email/package-lock.json
deleted file mode 100644
index b4be1c30..00000000
--- a/social/email/package-lock.json
+++ /dev/null
@@ -1,163 +0,0 @@
-{
-  "name": "node-red-node-email",
-  "version": "1.0.6",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "addressparser": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz",
-      "integrity": "sha1-R6++GiqSYhkdtoOOT9HTm0CCF0Y="
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-    },
-    "encoding": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
-      "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
-      "requires": {
-        "iconv-lite": "~0.4.13"
-      }
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-    },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "imap": {
-      "version": "0.8.19",
-      "resolved": "https://registry.npmjs.org/imap/-/imap-0.8.19.tgz",
-      "integrity": "sha1-NniHOTSrCc6mukh0HyhNoq9Z2NU=",
-      "requires": {
-        "readable-stream": "1.1.x",
-        "utf7": ">=1.0.2"
-      }
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-    },
-    "isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-    },
-    "mailparser-mit": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/mailparser-mit/-/mailparser-mit-0.6.2.tgz",
-      "integrity": "sha1-XcRAcbMyJ1bwSyzw+BebQTmeoO4=",
-      "requires": {
-        "encoding": "^0.1.12",
-        "mime": "^1.3.4",
-        "mimelib": "^0.3.0",
-        "uue": "^3.1.0"
-      }
-    },
-    "mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
-    },
-    "mimelib": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/mimelib/-/mimelib-0.3.1.tgz",
-      "integrity": "sha1-eHrdJBXYJ6yzr27EvKHqlZZBiFM=",
-      "requires": {
-        "addressparser": "~1.0.1",
-        "encoding": "~0.1.12"
-      }
-    },
-    "minimist": {
-      "version": "0.0.10",
-      "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-      "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8="
-    },
-    "nodemailer": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-4.7.0.tgz",
-      "integrity": "sha512-IludxDypFpYw4xpzKdMAozBSkzKHmNBvGanUREjJItgJ2NYcK/s8+PggVhj7c2yGFQykKsnnmv1+Aqo0ZfjHmw=="
-    },
-    "optimist": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-      "requires": {
-        "minimist": "~0.0.1",
-        "wordwrap": "~0.0.2"
-      }
-    },
-    "poplib": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/poplib/-/poplib-0.1.7.tgz",
-      "integrity": "sha1-L0tYtVkpcjUM2X9IKrpo+OBVdLw=",
-      "requires": {
-        "optimist": "*"
-      }
-    },
-    "readable-stream": {
-      "version": "1.1.14",
-      "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-      "requires": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "semver": {
-      "version": "5.3.0",
-      "resolved": "http://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-      "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
-    },
-    "string_decoder": {
-      "version": "0.10.31",
-      "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-    },
-    "utf7": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz",
-      "integrity": "sha1-lV9JCq5lO6IguUVqCod2wZk2CZE=",
-      "requires": {
-        "semver": "~5.3.0"
-      }
-    },
-    "uue": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/uue/-/uue-3.1.2.tgz",
-      "integrity": "sha512-axKLXVqwtdI/czrjG0X8hyV1KLgeWx8F4KvSbvVCnS+RUvsQMGRjx0kfuZDXXqj0LYvVJmx3B9kWlKtEdRrJLg==",
-      "requires": {
-        "escape-string-regexp": "~1.0.5",
-        "extend": "~3.0.0"
-      }
-    },
-    "wordwrap": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc="
-    }
-  }
-}
diff --git a/social/email/package.json b/social/email/package.json
index af84634f..a49be804 100644
--- a/social/email/package.json
+++ b/social/email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-email",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Node-RED nodes to send and receive simple emails",
   "dependencies": {
     "imap": "^0.8.19",