diff --git a/mailnews/news/resources/content/downloadheaders.js b/mailnews/news/resources/content/downloadheaders.js
index ef687e0ec60c..f42722258797 100644
--- a/mailnews/news/resources/content/downloadheaders.js
+++ b/mailnews/news/resources/content/downloadheaders.js
@@ -31,9 +31,9 @@ var serverid = null;
 var markreadElement = null;
 var numberElement = null;
 
-var accountManager = Components.classes["component://netscape/messenger/account-manager"].getService(Components.interfaces.nsIMsgAccountManager);
-var server = accountManager.getIncomingServer(serverid);
-var nntpServer = server.QueryInterface(Components.interfaces.nsINntpIncomingServer);
+var server = null;
+var nntpServer = null;
+
 
 
 function OnLoad()
@@ -51,6 +51,10 @@ function OnLoad()
 		dump("newsgroup name = " + newsgroupname + "\n");
 		dump("serverid = " + serverid + "\n");
 
+		var accountManager = Components.classes["component://netscape/messenger/account-manager"].getService(Components.interfaces.nsIMsgAccountManager);
+		server = accountManager.getIncomingServer(serverid);
+		nntpServer = server.QueryInterface(Components.interfaces.nsINntpIncomingServer);
+
 		var downloadHeadersTitlePrefix = Bundle.GetStringFromName("downloadHeadersTitlePrefix");
 		var downloadHeadersInfoText1 = Bundle.GetStringFromName("downloadHeadersInfoText1");
 		var downloadHeadersInfoText2 = Bundle.GetStringFromName("downloadHeadersInfoText2");
@@ -82,4 +86,6 @@ function setDivText(divname, value) {
 function OkButtonCallback() {
 	nntpServer.maxArticles = numberElement.value;
 	nntpServer.markOldRead = markreadElement.checked;
+
+	return true;
 }
diff --git a/mailnews/news/src/nsNNTPNewsgroupList.cpp b/mailnews/news/src/nsNNTPNewsgroupList.cpp
index adc4d8f73184..574ad36604bd 100644
--- a/mailnews/news/src/nsNNTPNewsgroupList.cpp
+++ b/mailnews/news/src/nsNNTPNewsgroupList.cpp
@@ -445,6 +445,7 @@ nsNNTPNewsgroupList::GetRangeOfArtsToDownload(
 				args.Append(*last - *first + 1);
 				args.Append(",");
 				args.Append(m_groupName);
+				args.Append(",");
 
 				// get the server key
 				nsXPIDLCString serverKey;