diff --git a/web/root/msgs/savemsg.ssjs b/web/root/msgs/savemsg.ssjs
index 7a8ef63940d5bfb0b015062eb5e63f720bfbac4d..1ac70ce8e5a00b9063bf928af877e8e2a6cf4a87 100644
--- a/web/root/msgs/savemsg.ssjs
+++ b/web/root/msgs/savemsg.ssjs
@@ -25,11 +25,13 @@ if(sub!='mail')  {
 	}
 }
 else {
-	hdrs.to_net_type=netaddr_type(to);
+	hdrs.to_net_type = NET_NONE;
+    var at = to.indexOf('@');
+    if(at > 0)
+		hdrs.to_net_type=netaddr_type(to);
 	if(hdrs.to_net_type!=NET_NONE) {
 		if(user.security.restrictions&UFLAG_M)
 			error("You do not have permission to send netmail");
-        var at = to.indexOf('@');
         if(hdrs.to_net_type!=NET_INTERNET && at > 0) {
             hdrs.to_net_addr = to.slice(at + 1);
             to = to.slice(0, at);