diff --git a/mozilla/mailnews/base/prefs/resources/content/am-junk.js b/mozilla/mailnews/base/prefs/resources/content/am-junk.js
index 4abe2114bca..cadd829cd83 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-junk.js
+++ b/mozilla/mailnews/base/prefs/resources/content/am-junk.js
@@ -45,10 +45,24 @@ function onInit()
   document.getElementById('spamLevel').checked =
     document.getElementById('server.spamLevel').value > 0;
     
-  SetFolderPicker(document.getElementById('server.spamActionTargetAccount').value,
-                  'actionTargetAccount');
-  SetFolderPicker(document.getElementById('server.spamActionTargetFolder').value,
-                  'actionTargetFolder');
+  var spamActionTargetAccount = document.getElementById('server.spamActionTargetAccount').value;
+  if (!spamActionTargetAccount)
+  {
+    var server = GetMsgFolderFromUri(parent.pendingServerId, false).server;
+    if (server.canCreateFoldersOnServer && server.canSearchMessages)
+      spamActionTargetAccount = parent.pendingServerId;
+    else
+      spamActionTargetAccount = parent.accountManager.localFoldersServer.serverURI;
+    document.getElementById('server.spamActionTargetAccount').value = spamActionTargetAccount;
+  }
+  SetFolderPicker(spamActionTargetAccount, 'actionTargetAccount');
+  var spamActionTargetFolder = document.getElementById('server.spamActionTargetFolder').value;
+  if (!spamActionTargetFolder)
+  {
+    spamActionTargetFolder = parent.accountManager.localFoldersServer.serverURI + "/Junk";
+    document.getElementById('server.spamActionTargetFolder').value = spamActionTargetFolder;
+  }
+  SetFolderPicker(spamActionTargetFolder, 'actionTargetFolder');
   
   // set up the whitelist UI
   document.getElementById("whiteListAbURI").value =
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-junk.xul b/mozilla/mailnews/base/prefs/resources/content/am-junk.xul
index 91cfabe3ca2..8ea33e439e3 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-junk.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/am-junk.xul
@@ -52,6 +52,7 @@
       onload="parent.onPanelLoaded('am-junk.xul');">
 
   <script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/am-junk.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/am-prefs.js"/>
   <script type="application/x-javascript" src="chrome://messenger/content/amUtils.js"/>