Fix bug reported by Ray Quinn: when replying to FidoNet NetMail, the

destination address did not contain the "from" name of the original msg.

web/root/msgs/reply.ssjs

@@ -44,12 +44,16 @@ template.subject=hdr.subject;
 if(template.subject.search(/^re:\s+/i)==-1)
 	template.subject='Re: '+template.subject;
 if(sub=='mail') {
-	if(hdr.replyto_net_addr!=undefined && hdr.replyto_net_addr != '')
+	if(hdr.replyto_net_addr!=undefined && hdr.replyto_net_addr != '') {
 		template.from=hdr.replyto_net_addr;
-	else {
-		if(hdr.from_net_addr != undefined && hdr.from_net_addr != '')
+        if(template.from.indexOf('@') < 0)
+            template.from=hdr.replyto+'@'+hdr.replyto_net_addr;
+	} else {
+		if(hdr.from_net_addr != undefined && hdr.from_net_addr != '') {
 			template.from=hdr.from_net_addr;
-		else
+            if(template.from.indexOf('@') < 0)
+                template.from=hdr.from+'@'+hdr.from_net_addr;
+		} else
 			template.from=hdr.from;
 	}
 }