diff --git a/mailnews/base/resources/content/msgMail3PaneWindow.js b/mailnews/base/resources/content/msgMail3PaneWindow.js
index 3e651ce9b6de..c307ca08cec9 100644
--- a/mailnews/base/resources/content/msgMail3PaneWindow.js
+++ b/mailnews/base/resources/content/msgMail3PaneWindow.js
@@ -136,7 +136,7 @@ var folderListener = {
 				{
 				  gCurrentLoadingFolderURI = "";
 				  //Now let's select the first new message if there is one
-				  SelectFirstNewMessage();
+				  ScrollToFirstNewMessage();
 				}
 			}
 
diff --git a/mailnews/base/resources/content/msgViewNavigation.js b/mailnews/base/resources/content/msgViewNavigation.js
index e35a44f674d8..ce7bfd35491a 100644
--- a/mailnews/base/resources/content/msgViewNavigation.js
+++ b/mailnews/base/resources/content/msgViewNavigation.js
@@ -575,14 +575,16 @@ function FindNextThread(startThread, nextThreadFunction, startFromBeginning, che
 	return nextThread;
 }
 
-function SelectFirstNewMessage()
+function ScrollToFirstNewMessage()
 {
 	var tree = GetThreadTree();
 
 	var newMessage = GetNextMessage(tree, null, GoNewMessage, ResourceGoNewMessage, null, false)
 
 	if(newMessage)
-		SelectNextMessage(newMessage); 
+	{
+		tree.ensureElementIsVisible(newMessage); 
+	}
 }