--- a/bearermanagement/mpm/src/mpmwlanquerydialog.cpp	Thu Dec 17 08:55:21 2009 +0200
+++ b/bearermanagement/mpm/src/mpmwlanquerydialog.cpp	Thu Jan 07 12:56:54 2010 +0200
@@ -431,6 +431,11 @@
     MPMLOGSTRING2( "CMPMWlanQueryDialog::StartWlanQuery KCTSYEmergencyCallInfo = %d", 
                    emergencyCallEstablished )
 
+    // Get note behaviour setting
+    TUint32 noteBehaviour( 0 );
+    noteBehaviour = iIapSelection.MpmConnPref().NoteBehaviour();
+    MPMLOGSTRING2( "CMPMWlanQueryDialog::StartWlanQuery noteBehaviour = %d", noteBehaviour )
+    
     if( !emergencyCallEstablished && 
         iIapSelection.Session()->IsPhoneOfflineL() && 
         !activeWlanIap && 
@@ -444,6 +449,11 @@
             MPMLOGSTRING( "CMPMWlanQueryDialog::StartWlanQuery user has already refused offline" )
             iIapSelection.UserWlanSelectionDoneL( KErrCancel, iWlanIapId );
             }
+        else if ( noteBehaviour & TExtendedConnPref::ENoteBehaviourConnDisableQueries )
+            {
+            MPMLOGSTRING( "CMPMWlanQueryDialog::StartWlanQuery offline note query not shown due to disabled queries" )
+            iIapSelection.UserWlanSelectionDoneL( KErrPermissionDenied, iWlanIapId );
+            }
         else
             {
             MPMLOGSTRING( "CMPMWlanQueryDialog::StartWlanQuery, starting offline note" )