diff --git a/mailnews/local/src/nsLocalMailFolder.cpp b/mailnews/local/src/nsLocalMailFolder.cpp
index be1a671275b..41a8d87d963 100644
--- a/mailnews/local/src/nsLocalMailFolder.cpp
+++ b/mailnews/local/src/nsLocalMailFolder.cpp
@@ -3384,7 +3384,9 @@ nsMsgLocalMailFolder::SetFlagsOnDefaultMailboxes(PRUint32 flags)
   if (flags & MSG_FOLDER_FLAG_QUEUE)
     setSubfolderFlag(NS_LITERAL_STRING("Unsent Messages").get(), MSG_FOLDER_FLAG_QUEUE);
 	
-  // what about the Junk folder?
+  if (flags & MSG_FOLDER_FLAG_JUNK)
+    setSubfolderFlag(NS_LITERAL_STRING("Junk").get(), MSG_FOLDER_FLAG_JUNK);
+
 	return NS_OK;
 }
 
diff --git a/mailnews/local/src/nsMovemailIncomingServer.cpp b/mailnews/local/src/nsMovemailIncomingServer.cpp
index a6c9bd9454c..4d4159cc7cf 100644
--- a/mailnews/local/src/nsMovemailIncomingServer.cpp
+++ b/mailnews/local/src/nsMovemailIncomingServer.cpp
@@ -115,6 +115,7 @@ nsMovemailIncomingServer::SetFlagsOnDefaultMailboxes()
                                             MSG_FOLDER_FLAG_DRAFTS |
                                             MSG_FOLDER_FLAG_TEMPLATES |
                                             MSG_FOLDER_FLAG_TRASH |
+                                            MSG_FOLDER_FLAG_JUNK |
                                             // hmm?
                                             MSG_FOLDER_FLAG_QUEUE);
     return NS_OK;
diff --git a/mailnews/local/src/nsNoIncomingServer.cpp b/mailnews/local/src/nsNoIncomingServer.cpp
index 050e77e029b..328ed0273a0 100644
--- a/mailnews/local/src/nsNoIncomingServer.cpp
+++ b/mailnews/local/src/nsNoIncomingServer.cpp
@@ -94,6 +94,7 @@ nsNoIncomingServer::SetFlagsOnDefaultMailboxes()
                                             MSG_FOLDER_FLAG_DRAFTS |
                                             MSG_FOLDER_FLAG_TEMPLATES |
                                             MSG_FOLDER_FLAG_TRASH |
+                                            MSG_FOLDER_FLAG_JUNK |
                                             MSG_FOLDER_FLAG_QUEUE);
     return NS_OK;
 }	
diff --git a/mailnews/local/src/nsPop3IncomingServer.cpp b/mailnews/local/src/nsPop3IncomingServer.cpp
index db01a541cc4..564212615f0 100644
--- a/mailnews/local/src/nsPop3IncomingServer.cpp
+++ b/mailnews/local/src/nsPop3IncomingServer.cpp
@@ -194,7 +194,8 @@ nsPop3IncomingServer::SetFlagsOnDefaultMailboxes()
                                             MSG_FOLDER_FLAG_SENTMAIL |
                                             MSG_FOLDER_FLAG_DRAFTS |
                                             MSG_FOLDER_FLAG_TEMPLATES |
-                                            MSG_FOLDER_FLAG_TRASH);
+                                            MSG_FOLDER_FLAG_TRASH |
+                                            MSG_FOLDER_FLAG_JUNK);
     return NS_OK;
 }