diff --git a/exec/nntpservice.js b/exec/nntpservice.js
index f4254495441da4fe73f5ae3709d95e7dd98c243e..6b677ec6ca1b0b95e58b6184a72bb22255e72148 100644
--- a/exec/nntpservice.js
+++ b/exec/nntpservice.js
@@ -391,10 +391,12 @@ while(client.socket.is_connected) {
 				writeln("Subject: " + hdr.subject);
 				writeln("Message-ID: " + hdr.id);
 				writeln("Date: " + hdr.date);
-				if(hdr.newsgroups!=undefined)
+				if(hdr.newsgroups!=undefined 
+					&& hdr.newsgroups.indexOf(selected.newsgroup) >= 0)
 					writeln("Newsgroups: " + hdr.newsgroups);
 				else
 					writeln("Newsgroups: " + selected.newsgroup);
+
 				if(hdr.reply_id!=undefined)
 					writeln("References: " + hdr.reply_id);
 				/* FidoNet header */