diff --git a/social/email/61-email.html b/social/email/61-email.html
index d67fb52b..a0267f4a 100644
--- a/social/email/61-email.html
+++ b/social/email/61-email.html
@@ -1,4 +1,8 @@
 <script type="text/html" data-template-name="e-mail">
+    <div class="form-row">
+        <label for="node-input-dname"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
+        <input type="text" id="node-input-dname" data-i18n="[placeholder]node-red:common.label.name">
+    </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-envelope"></i> <span data-i18n="email.label.to"></span></label>
         <input type="text" id="node-input-name" placeholder="email@address.com">
@@ -70,10 +74,6 @@
         <input type="checkbox" id="node-input-tls" style="display:inline-block; width:20px; vertical-align:baseline;">
         <span data-i18n="email.label.rejectUnauthorised"></span>
     </div>
-    <div class="form-row">
-        <label for="node-input-dname"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
-        <input type="text" id="node-input-dname" data-i18n="[placeholder]node-red:common.label.name">
-    </div>
     <div class="form-tips" id="node-tip"><span data-i18n="[html]email.tip.cred"></span></div>
 </script>
 
@@ -156,6 +156,10 @@
 
 
 <script type="text/html" data-template-name="e-mail in">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
+        <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
+    </div>
     <div class="form-row">
         <label for="node-input-fetch"><i class="fa fa-hourglass-half"></i> <span data-i18n="email.label.getmail"></span></label>
         <select type="text" id="node-input-fetch" style="width:130px;">
@@ -252,11 +256,6 @@
             -->
         </select>
     </div>
-    <br/>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
-    </div>
     <script>
         var checkPorts = function() {
             var currentPort = $("#node-input-port").val();
@@ -408,6 +407,10 @@
 
 
 <script type="text/html" data-template-name="e-mail mta">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
+        <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
+    </div>
     <div class="form-row">
         <label for="node-input-port"><i class="fa fa-random"></i> <span data-i18n="email.label.port"></span></label>
         <input type="text" id="node-input-port" style="width:100px">
@@ -451,10 +454,6 @@
         <label for="node-input-expert"><i class="fa fa-cog"></i> <span data-i18n="email.label.expert"></span></label>
         <input type="text" id="node-input-expert">
     </div>
-    <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
-    </div>
     <div class="form-tips" id="node-tip"><span data-i18n="[html]email.tip.mta"></span></div>
 </script>
 
diff --git a/social/email/package.json b/social/email/package.json
index e94aec55..ec0006dc 100644
--- a/social/email/package.json
+++ b/social/email/package.json
@@ -1,13 +1,13 @@
 {
   "name": "node-red-node-email",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Node-RED nodes to send and receive simple emails.",
   "dependencies": {
     "imap": "^0.8.19",
-    "node-pop3": "^0.8.0",
+    "node-pop3": "^0.9.0",
     "mailparser": "^3.6.4",
-    "nodemailer": "^6.9.3",
-    "smtp-server": "^3.12.0"
+    "nodemailer": "^6.9.7",
+    "smtp-server": "^3.13.0"
   },
   "bundledDependencies": [
     "imap",