diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/mailto/catchall.js b/zefie_wtvp_minisrv/includes/ServiceVault/mailto/catchall.js
new file mode 100644
index 00000000..89adadaa
--- /dev/null
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/mailto/catchall.js
@@ -0,0 +1,16 @@
+var minisrv_service_file = true;
+
+var mailto = request_headers.request_url;
+mailto = mailto.substring(mailto.indexOf(":") + 1);
+mailto = mailto.split("?")[0];
+var subject = request_headers.query.subject || "";
+var body = request_headers.query.body || "";
+
+session_data.deleteSessionData("mail_draft");
+session_data.deleteSessionData("mail_draft_attachments");
+
+// We will have to add Carbon Copy headers eventually, but we do get a pass on Blind Carbon Copy since that was never supported
+headers = `302 Moved temporarily
+Content-Type: text/html
+wtv-expire: wtv-mail:/sendmail
+Location: wtv-mail:/sendmail?message_to=${mailto}&message_subject=${subject}&message_body=${body}`;
diff --git a/zefie_wtvp_minisrv/includes/config.json b/zefie_wtvp_minisrv/includes/config.json
index 1a021d65..9c17a00a 100644
--- a/zefie_wtvp_minisrv/includes/config.json
+++ b/zefie_wtvp_minisrv/includes/config.json
@@ -226,12 +226,31 @@
       "port": 1607,
       "privileged": true
     },
+    "wtv-mail": {
+      // wtv-mail
+      "port": 1608,
+      "connections": 3,
+      "modules": [
+        "WTVNews"
+      ]
+    },
+    "mailto": {
+      "port": 1608
+    },    
     "wtv-log": {
       // wtv-log
       "port": 1609,
       "connections": 1,
       "write_logs_to_disk": false // set this to true to save logs to the error_log_file set above
     },
+    "wtv-favorite": {
+      // wtv-favorite
+      "port": 1611,
+      "connections": 3,
+      "enable_multi_query": true,
+      "max_folders": 14,
+      "max_favorites_per_folder": 18
+    },    
     "wtv-home": {
       // wtv-home
       "port": 1612
@@ -272,17 +291,19 @@
         "WTVRegister"
       ]
     },
-    "wtv-music": {
-      // wtv-music
-      "port": 1656,
-      "connections": 3,
-      "flags": "0x00000004"
-    },
     "wtv-cookie": {
       // wtv-cookie (used for http(s) cookies)
       "port": 1619,
       "connections": 1
     },
+    "wtv-guide": {
+      // wtv-guide (not yet complete)
+      "port": 1621,
+      "connections": 3,
+      "modules": [
+        "WTVGuide"
+      ]
+    },    
     "wtv-chat": {
       // wtv-chat (used for IRC)
       "port": 1630,
@@ -309,41 +330,6 @@
         "WTVDisk"
       ]
     },
-    "wtv-guide": {
-      // wtv-guide (not yet complete)
-      "port": 1621,
-      "connections": 3,
-      "modules": [
-        "WTVGuide"
-      ]
-    },
-    "wtv-mail": {
-      // wtv-mail
-      "port": 1608,
-      "connections": 3,
-      "modules": [
-        "WTVNews"
-      ]
-    },
-    "wtv-passport": {
-      // wtv-passport (for messenger)
-      "port": 1654
-    },
-    "wtv-favorite": {
-      // wtv-favorite
-      "port": 1611,
-      "connections": 3,
-      "enable_multi_query": true,
-      "max_folders": 14,
-      "max_favorites_per_folder": 18
-    },
-    "wtv-admin": {
-      // wtv-admin
-      "port": 1698,
-      "enable_multi_query": true,
-      "privileged": true,
-      "password": "viRak-7" // change to something more unique
-    },
     "wtv-author": {
       "port": 1643,
       "connections": 3,
@@ -384,8 +370,17 @@
       "external_proxy_port": 7851,
       "external_proxy_is_http1": true,
       "flags": "0x00000001"
+    },        
+    "wtv-passport": {
+      // wtv-passport (for messenger)
+      "port": 1654
     },
-
+    "wtv-music": {
+      // wtv-music
+      "port": 1656,
+      "connections": 3,
+      "flags": "0x00000004"
+    },    
     "pb_services": {
       // PC Services for PageBuilder
       "port": 1697,
@@ -398,6 +393,13 @@
       "allow_https": false, // for future use with LetsEncrypt
       "force_https": false // for future use with LetsEncrypt
     },
+    "wtv-admin": {
+      // wtv-admin
+      "port": 1698,
+      "enable_multi_query": true,
+      "privileged": true,
+      "password": "viRak-7" // change to something more unique
+    },    
     "pc_services": {
       // PC Services
       "port": 1699,