Use user!qwkid@hostname addresses for QWK netmail over SMTP.

src/sbbs3/mailsrvr.c

@@ -475,7 +475,7 @@ static ulong sockmsgtxt(SOCKET socket, smbmsg_t* msg, char* msgtxt, ulong maxlin
 		if(msg->from_net.type==NET_INTERNET && msg->from_net.addr!=NULL)
 			SAFECOPY(fromaddr,(char*)msg->from_net.addr);
 		else if(msg->from_net.type==NET_QWK && msg->from_net.addr!=NULL)
-			sprintf(fromaddr,"\"%s@%s\"@%s"
+			sprintf(fromaddr,"%s!%s@%s"
 				,msg->from,(char*)msg->from_net.addr,scfg.sys_inetaddr);
 		else 
 			usermailaddr(&scfg,fromaddr,msg->from);
@@ -2601,6 +2601,8 @@ static void smtp_thread(void* arg)
 			usernum=0;	/* unknown user at this point */
 
 			tp=strrchr(p,'@');		/* Double-@? Routed QWKnet mail? */
+			if(tp==NULL)
+				tp=strrchr(p,'!');	/* Or user!node@host format */
 			if(tp!=NULL) {
 				*tp=0;
 				SAFECOPY(rcpt_addr,p);