--- a/bearermanagement/mpm/src/mpmdatausagewatcher.cpp	Fri Feb 19 23:12:51 2010 +0200
+++ b/bearermanagement/mpm/src/mpmdatausagewatcher.cpp	Fri Mar 12 15:44:18 2010 +0200
@@ -113,13 +113,13 @@
     // Get the new value from central repository
     User::LeaveIfError( iRepository->Get( KCurrentCellularDataUsage,
             iCellularDataUsage ) );
-
+    
     // Stop cellular connections if the setting changes into Disabled
-    if (oldCellularDataUsage != ECmCellularDataUsageDisabled &&
-            iCellularDataUsage == ECmCellularDataUsageDisabled)
+    if ( oldCellularDataUsage != ECmCellularDataUsageDisabled &&
+         iCellularDataUsage == ECmCellularDataUsageDisabled &&
+         iServer->RoamingWatcher()->RoamingStatus() != EMPMRoamingStatusUnknown )
         {
-        // TODO: Uncomment this when trying to get stopping working.
-        // iServer->StopCellularConns();
+        iServer->StopCellularConns();
         }
     }