diff --git a/exec/nntpservice.js b/exec/nntpservice.js
index f7ff73f5449c020c0ddb3f6d317aaa6ad6c29fe4..1face70b021438267d956cbab65e5939dde2cd94 100644
--- a/exec/nntpservice.js
+++ b/exec/nntpservice.js
@@ -312,14 +312,11 @@ while(client.socket.is_connected) {
 				if(hdr.from_net_type)
 					writeln(format("From: \"%s\" <%s@%s>"
 						,hdr.from,hdr.from,hdr.from_net_addr));
-				else if(hdr.from.indexOf(' ')>0)
-					writeln(format("From: \"%s\" <\"%s\"@%s>"
-						,hdr.from
-						,hdr.from,system.inetaddr));
 				else
 					writeln(format("From: \"%s\" <%s@%s>"
 						,hdr.from
-						,hdr.from,system.inetaddr));
+						,hdr.from.replace(/ /g,"_")
+						,system.inetaddr));
 				writeln("To: " + hdr.to);
 				writeln("X-Comment-To: " + hdr.to);
 				writeln("Subject: " + hdr.subject);