--- a/notepad/notepad1/LibSrc/NpdListDialog.cpp	Wed Jun 09 09:40:23 2010 +0300
+++ b/notepad/notepad1/LibSrc/NpdListDialog.cpp	Mon Jun 21 15:38:59 2010 +0300
@@ -873,9 +873,18 @@
 		{
 		return;
 		}
+	
+    ClearSavedCurrentAndSelections();
+    SaveCurrentAndSelectionsL();
     iModel->SyncL(EFalse);
     CNotepadDialogBase::DynInitMenuPaneL( aResourceId, aMenuPane );
-    const TInt memoCount( iModel->MdcaCount() - KNumberOfFixedItem );
+    
+    TInt memoCount = iModel->MdcaCount();
+    if ( IsNoteListDialog() )
+        {
+        memoCount = memoCount - KNumberOfFixedItem;
+        }
+    
    	const TInt markCount(iListBox->SelectionIndexes()->Count());
 	TInt index;
 	switch (aResourceId )