diff --git a/mailnews/base/resources/content/commandglue.js b/mailnews/base/resources/content/commandglue.js
index 4ff693501aa4..8325c8f3edac 100644
--- a/mailnews/base/resources/content/commandglue.js
+++ b/mailnews/base/resources/content/commandglue.js
@@ -512,10 +512,12 @@ function GetNextMessageAfterDelete(messages)
 
 	var curMessage = messages[0];
 	var nextMessage = null;
+	var tree = GetThreadTree();
+
 	//search forward
 	while(curMessage)
 	{
-		nextMessage = GetNextMessage(curMessage, GoMessage, false);
+		nextMessage = GetNextMessage(tree, curMessage, GoMessage, false);
 		if(nextMessage)
 		{
 			if(!MessageInSelection(nextMessage, messages))