--- a/ipsservices/ipssossettings/src/ipssetdata.cpp	Tue Jan 26 11:45:42 2010 +0200
+++ b/ipsservices/ipssossettings/src/ipssetdata.cpp	Tue Feb 02 00:02:40 2010 +0200
@@ -745,17 +745,6 @@
     }
 
 // ---------------------------------------------------------------------------
-// CIpsSetData::Roaming()
-// ---------------------------------------------------------------------------
-//
-TBool CIpsSetData::Roaming() const
-    {
-    FUNC_LOG;
-    return ( iExtendedSettings->AlwaysOnlineState() == EMailAoHomeOnly ||
-        iExtendedSettings->EmailNotificationState() == EMailEmnHomeOnly );
-    }
-
-// ---------------------------------------------------------------------------
 // CIpsSetData::SetProtocol()
 // ---------------------------------------------------------------------------
 //
@@ -1147,11 +1136,8 @@
     // Always Online in use        
     if ( aSchedule >= E5Mins && aSchedule <= E1Day )
         {
-        iExtendedSettings->SetAlwaysOnlineState( 
-            aRoaming ? EMailAoHomeOnly : EMailAoAlways );
+        iExtendedSettings->SetAlwaysOnlineState( EMailAoAlways );
         iExtendedSettings->SetInboxRefreshTime( time );
-        iExtendedSettings->SetRoamHomeOnlyFlag( aRoaming );
-        // set emn off when ao is in use
         iExtendedSettings->SetEmailNotificationState( EMailEmnOff );
         }
     // Set EMN        
@@ -1159,8 +1145,7 @@
         {
         // set always online state off when emn is on
         iExtendedSettings->SetAlwaysOnlineState( EMailAoOff );
-        iExtendedSettings->SetEmailNotificationState( 
-            aRoaming ? EMailEmnHomeOnly : EMailEmnAutomatic );
+        iExtendedSettings->SetEmailNotificationState( EMailEmnAutomatic );
         iExtendedSettings->SetInboxRefreshTime( KErrNotFound );
         }
     // Manual connection mode