--- a/emailuis/emailui/inc/ncsaifeditor.h	Thu Dec 17 08:39:21 2009 +0200
+++ b/emailuis/emailui/inc/ncsaifeditor.h	Thu Jan 07 12:38:38 2010 +0200
@@ -36,7 +36,7 @@
     {
 public: // constructors/destructor
     
-    CNcsAifEditor( MNcsFieldSizeObserver* aSizeObserver );
+    CNcsAifEditor( MNcsFieldSizeObserver* aSizeObserver, const TDesC& aCaptionText );
     	
     void ConstructL( const CCoeControl* aParent,
                      TInt aNumberOfLines,
@@ -47,6 +47,7 @@
 public: // from CoeControl
     
     TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType );
+    void HandlePointerEventL( const TPointerEvent& aPointerEvent );
 
 public: // from MEikEdwinObserver
     
@@ -178,7 +179,8 @@
             const CNcsAifEntry* aEntry,
             TInt& aNrOfMatchesInText,
             TInt& aNrOfMatchesInEntryArray );
-    
+    void CompleteEntryL();
+
 private: // data
 
     RPointerArray<CNcsAifEntry> iArray;
@@ -193,6 +195,8 @@
     
     // Flag indicating whether add the leftover text to the end of the field
     TBool iAddLeftover;
+    TCursorSelection  iTextSelection;
+    TBool             iPartialRemove;
 	};