--- a/profilesservices/ProfileEngine/EngSrc/CProfileTonesImpl.cpp	Fri Jun 25 17:09:30 2010 +0800
+++ b/profilesservices/ProfileEngine/EngSrc/CProfileTonesImpl.cpp	Thu Nov 04 13:38:47 2010 +0800
@@ -19,16 +19,14 @@
 
 // INCLUDE FILES
 #include "CProfileTonesImpl.h"
+#include <s32strm.h>
+#include <centralrepository.h>
 #include "ProfileEngUtils.h"
 #include "ProfileEnginePrivateCRKeys.h"
-
-#include <s32strm.h>
-#include <centralrepository.h>
 #include <hwrmvibrasdkcrkeys.h>
 
 #include <psmsettings.h>
 #include <psmsrvdomaincrkeys.h>
-#include <ProfileEngineInternalCRKeys.h>
 
 // ============================ MEMBER FUNCTIONS ===============================
 
@@ -141,40 +139,19 @@
             aCenRep.Get( ProfileEngUtils::ResolveKey( KProEngRingingType,
             aProfileId ), value ) );
     iProfileToneSettings.iRingingType = TProfileRingingType( value );
-    
-    //Since 10.1, check if silence mode
-    User::LeaveIfError(
-            aCenRep.Get( KProEngSilenceMode , value) );
-    if ( value )
-    	{
-		iProfileToneSettings.iRingingType = EProfileRingingTypeSilent;
-    	}
-    
     User::LeaveIfError(
             aCenRep.Get( ProfileEngUtils::ResolveKey( KProEngKeypadVolume,
             aProfileId ), value ) );
     iProfileToneSettings.iKeypadVolume = TProfileKeypadVolume( value );
- /* 
-  *   User::LeaveIfError(
+    User::LeaveIfError(
             aCenRep.Get( ProfileEngUtils::ResolveKey( KProEngRingingVolume,
             aProfileId ), iProfileToneSettings.iRingingVolume ) );
-     */
-    
-    //Since 10.1, Only master volume used.
-    User::LeaveIfError(
-            aCenRep.Get( KProEngMasterVolume , iProfileToneSettings.iRingingVolume ) );
-    
-    
-    /*
     User::LeaveIfError(
             aCenRep.Get( ProfileEngUtils::ResolveKey( KProEngVibra,
             aProfileId ), iProfileToneSettings.iVibratingAlert ) );
-    */
-    
-    //Since 10.1,Only master vibra used
     User::LeaveIfError(
-            aCenRep.Get( KProEngMasterVibra, iProfileToneSettings.iVibratingAlert ) );
-            
+          aCenRep.Get( ProfileEngUtils::ResolveKey( KProEngEmailVibra,
+           aProfileId ), iProfileToneSettings.iEmailVibratingAlert ) );   
     User::LeaveIfError(
             aCenRep.Get( ProfileEngUtils::ResolveKey( KProEngWarnAndGameTones,
             aProfileId ), iProfileToneSettings.iWarningAndGameTones ) );
@@ -190,6 +167,7 @@
     if ( iPowerSaveMode )
         {
         iProfileToneSettings.iVibratingAlert = iPsmConfigVibra;
+        iProfileToneSettings.iEmailVibratingAlert = iPsmConfigVibra;
         iProfileToneSettings.iKeypadVolume = 
                              TProfileKeypadVolume( iPsmConfigKeypadVolume );
         }
@@ -223,9 +201,6 @@
             aCenRep.Set( ProfileEngUtils::ResolveKey( KProEngRingingType,
             aProfileId ), iProfileToneSettings.iRingingType ) );
     User::LeaveIfError(
-            aCenRep.Set( ProfileEngUtils::ResolveKey( KProEngKeypadVolume,
-            aProfileId ), iProfileToneSettings.iKeypadVolume ) );
-    User::LeaveIfError(
             aCenRep.Set( ProfileEngUtils::ResolveKey( KProEngRingingVolume,
             aProfileId ), iProfileToneSettings.iRingingVolume ) );
     
@@ -237,8 +212,11 @@
         User::LeaveIfError(
                 aCenRep.Set( ProfileEngUtils::ResolveKey( KProEngVibra,
                 aProfileId ), iProfileToneSettings.iVibratingAlert ) );        
-        }
-    
+        
+   User::LeaveIfError(
+             aCenRep.Set( ProfileEngUtils::ResolveKey( KProEngEmailVibra,
+             aProfileId ), iProfileToneSettings.iEmailVibratingAlert ) );   
+     }
     User::LeaveIfError(
             aCenRep.Set( ProfileEngUtils::ResolveKey( KProEngWarnAndGameTones,
             aProfileId ), iProfileToneSettings.iWarningAndGameTones ) );