more work on drag drop move/copy handling 47195 r=mscott

mailnews/base/resources/content/messengerdnd.js

@@ -271,13 +271,15 @@ function DropOnFolderTree(event)
         else
         {
 			//temperary for single mail window, not working when supporting multiple mail windows
-			messageTree = GetThreadTree();
-			var nextMessage = GetNextMessageAfterDelete(messageTree.selectedItems);
-			if(nextMessage)
-				gNextMessageAfterDelete = nextMessage.getAttribute('id');
-			else
-				gNextMessageAfterDelete = null;
-
+			if (!ctrlKeydown)
+			{
+				messageTree = GetThreadTree();
+				var nextMessage = GetNextMessageAfterDelete(messageTree.selectedItems);
+				if(nextMessage)
+					gNextMessageAfterDelete = nextMessage.getAttribute('id');
+				else
+					gNextMessageAfterDelete = null;
+			}
 			messenger.CopyMessages(treeDatabase,
 									   sourceRescource,
 									   targetNode, messageList, !ctrlKeydown);
@@ -285,13 +287,15 @@ function DropOnFolderTree(event)
 	}
 	else
 	{
-
-		messageTree = GetThreadTree();
-		var nextMessage = GetNextMessageAfterDelete(messageTree.selectedItems);
-		if(nextMessage)
-			gNextMessageAfterDelete = nextMessage.getAttribute('id');
-		else
-			gNextMessageAfterDelete = null;
+		if (!ctrlKeydown)
+		{
+			messageTree = GetThreadTree();
+			var nextMessage = GetNextMessageAfterDelete(messageTree.selectedItems);
+			if(nextMessage)
+				gNextMessageAfterDelete = nextMessage.getAttribute('id');
+			else
+				gNextMessageAfterDelete = null;
+		}
 		messenger.CopyMessages(treeDatabase,
 							   sourceRescource,
 							   targetNode, messageList, !ctrlKeydown);

mailnews/local/src/nsLocalMailFolder.cpp

@@ -1719,7 +1719,7 @@ nsMsgLocalMailFolder::DeleteMessages(nsISupportsArray *messages,
                   DeleteMessage(message, msgWindow, PR_TRUE);
               }
           }
-		  if(!isMove)
+		  if(isMove)
         NotifyFolderEvent(mDeleteOrMoveMsgCompletedAtom);
       }
   }