--- a/notepad/notepad1/LibSrc/NpdListDialog.cpp	Wed Mar 31 21:29:10 2010 +0300
+++ b/notepad/notepad1/LibSrc/NpdListDialog.cpp	Wed Apr 14 15:55:57 2010 +0300
@@ -427,14 +427,11 @@
         SaveCurrentAndSelectionsL();
         TUid serviceUid = SendByKeysL(*iSendUi, aCommandId, *iModel, iSavedSelectedKeys);
         iModel->SyncL(EFalse); // sync might be delayed while SendAsL.
-        RestoreCurrentAndSelectionsL();
-        //RestoreCurrent();
         TUid EmailUid = {0x10001028};
         if ( serviceUid == EmailUid )
         	{
         	iSendingEmail = ETrue;
         	}
-       
         }
     else
         {
@@ -444,7 +441,6 @@
         SendAsL( *iSendUi, aCommandId, EFalse, text );
         CleanupStack::PopAndDestroy(); // text
         iModel->SyncL(EFalse); // sync might be delayed while SendAsL.
-        RestoreCurrentAndSelectionsL();
         }
     }
 
@@ -1530,7 +1526,7 @@
             iInts = new(ELeave) CArrayFixFlat<TInt>(2);
             iInts->AppendL(0);
             iInts->AppendL(aCount);
-            IncrementL(0); // SetTextL
+            IncrementL( 1 ); // SetTextL
             }
             break;
         default: