--- a/browserutilities/browsertelservice/src/BrowserTelService.cpp	Tue Feb 02 00:56:45 2010 +0200
+++ b/browserutilities/browsertelservice/src/BrowserTelService.cpp	Fri Mar 19 09:52:28 2010 +0200
@@ -22,20 +22,19 @@
 #include    <data_caging_path_literals.hrh>
 
 // For phonebook API
-#include <CPbkContactItem.h>    // Phonebook Contact
-#include <CPbkContactEngine.h>  // Phonebook Engine
-#include <CPbkFieldsInfo.h>     // Phonebook field types
-#include <RPbkViewResourceFile.h>
-#include <CPbkContactEditorDlg.h>   // Phonebook editor
+//#include <CPbkContactItem.h>    // Phonebook Contact
+//#include <CPbkContactEngine.h>  // Phonebook Engine
+//#include <CPbkFieldsInfo.h>     // Phonebook field types
+//#include <RPbkViewResourceFile.h>
+//#include <CPbkContactEditorDlg.h>   // Phonebook editor
 // For searching a matching number from contact's db
-#include <TPbkContactItemField.h>
+//#include <TPbkContactItemField.h>
 #include <CNTFLDST.H>
 
 #include <FeatMgr.h>
 // 
 #include <txtrich.h>
 #include <badesca.h>
-#include <miutset.h>
 #include <s32strm.h>
 
 // For email API
@@ -66,7 +65,7 @@
 // Const file name for make call
 #include <mmtsy_names.h>
 
-#include <browseruisdkcrkeys.h>
+#include <BrowserUiSDKCRKeys.h>
 #include <centralrepository.h>
 
 #include <nwx_status.h>
@@ -81,6 +80,8 @@
 
 const TInt KParseArrayAllocation = 10;
 const TInt KTimerDelay = 2500000;
+//constants 
+const TUid KUidMsgTypeSMTP                      = {0x10001028}; // 268439592 
 
 _LIT( KValidDTMFChars,"w/p*#0123456789ABCDabcd," );
 _LIT( KDTMFWaitChars, "/wp,*#" );
@@ -1381,7 +1382,7 @@
     {
     TELSERVICE_ENTERFN( "AddPBEntryL()" )
 
-    CPbkContactEngine* pbkEngine = CPbkContactEngine::NewL();
+/*    CPbkContactEngine* pbkEngine = CPbkContactEngine::NewL();
     CleanupStack::PushL( pbkEngine );
 
     // Make sure a resource file is available
@@ -1480,7 +1481,7 @@
     CleanupStack::PopAndDestroy( 3 ); // contactItem, pbkResourceFile, pbkEngine
 
     TELSERVICE_LEAVEFN( "AddPBEntryL()" )
-
+*/
     return KErrNone;
 	}
 
@@ -2352,7 +2353,7 @@
     HBufC* matchingName = NULL;
 	
     // Create phonebook engine
-    CPbkContactEngine* pbkEngine = CPbkContactEngine::NewL();
+/*    CPbkContactEngine* pbkEngine = CPbkContactEngine::NewL();
     CleanupStack::PushL( pbkEngine );
 
     // Make sure a resource file is available
@@ -2376,7 +2377,7 @@
         }
 
     CleanupStack::PopAndDestroy( 3 );   // idArray, pbkResourceFile, pbkEngine
-
+*/
     TELSERVICE_LEAVEFN("SearchPbForMatchL()")
 
     return matchingName;
@@ -2395,7 +2396,7 @@
 
     CContactIdArray* idArray = NULL;
 
-	if( aMatchType == EPhoneNumber )
+/*	if( aMatchType == EPhoneNumber )
 		{
 		idArray = aPbkEngine.MatchPhoneNumberL( aToMatch, aToMatch.Length() );
 		}
@@ -2411,7 +2412,7 @@
         CleanupStack::PopAndDestroy( findFrom );
 		}
 
-	CleanupStack::PushL( idArray );
+	CleanupStack::PushL( idArray ); */
     TELSERVICE_LEAVEFN( "SearchPbForMatchLC()" )
 	return idArray;
 	}
@@ -2679,7 +2680,7 @@
 
     aNewContact = ETrue;
 
-	if( idArrayPhoneNr->Count() && aNumber.Length() )
+/*	if( idArrayPhoneNr->Count() && aNumber.Length() )
 		{
 		// Open existing
 		if ( ShowDialogL( aNumber, EConfirmAddToPb ) )
@@ -2717,7 +2718,7 @@
 	CleanupStack::PopAndDestroy( 2 );		// idArrayEmail,idArrayPhoneNr
 
 	CleanupStack::PushL( contactItem );
-
+*/
     return contactItem;
     }
 
@@ -2733,7 +2734,7 @@
     {
     if( aFieldValue.Length() )
 		{
-        TPbkContactItemField *dataField = aContactItem->FindField( aField );
+  /*      TPbkContactItemField *dataField = aContactItem->FindField( aField );
 
         if( !dataField )
 			{
@@ -2761,7 +2762,7 @@
 			    {
                 aFormIndex = aContactItem->FindFieldIndex( *dataField );
 			    }
-            }
+            }*/
 		}
     }