--- a/realtimenetprots/sipfw/ClientResolver/Resolver/src/CSIPOptionsHandler.cpp	Fri Mar 12 15:44:11 2010 +0200
+++ b/realtimenetprots/sipfw/ClientResolver/Resolver/src/CSIPOptionsHandler.cpp	Mon Mar 15 12:42:05 2010 +0200
@@ -216,6 +216,25 @@
         CleanupStack::PopAndDestroy(sdpBuf);
         }
     AddAcceptToResponseL( *response, aUids, aSipClients, aClientResolver2 );
+	
+	
+	//Add ClientSpecificHeaders for OPTIONS here
+	for (TInt i=0; i < aClientResolver2.Clients().Count(); i++)
+        {
+        CSIPResolvedClient2* client = aClientResolver2.Clients()[i];
+        if ( client )
+            {
+			RPointerArray<CSIPHeaderBase> headers ;
+			CSIPHeaderBase::PushLC(&headers);
+            client->AddClientSpecificHeadersForOptionsResponseL(headers);
+			for (TInt i=0; i<headers.Count(); i++)
+				{
+				response->AddHeaderL(headers[i]);
+				}
+			CleanupStack::Pop(1); //headers
+            }
+        }   	
+        
     CleanupStack::Pop(response);
     return response;
     }

--- a/realtimenetprots/sipfw/SIP/NetworkMonitor/Plugins/Packet/Src/CPacketContextMonitor.h	Fri Mar 12 15:44:11 2010 +0200
+++ b/realtimenetprots/sipfw/SIP/NetworkMonitor/Plugins/Packet/Src/CPacketContextMonitor.h	Mon Mar 15 12:42:05 2010 +0200
@@ -132,6 +132,10 @@
 		TUint32 iRetryAfter;
 		
 		TInt iOtherMonitoringRetryCount;
+		
+#ifdef CPPUNIT_TEST 
+        friend class CPacketContextMonitorTest;
+#endif
 
 	};
 	

--- a/sipplugins/sippsipsettingsui/src/sipsettlistsipprofsetitemlist.cpp	Fri Mar 12 15:44:11 2010 +0200
+++ b/sipplugins/sippsipsettingsui/src/sipsettlistsipprofsetitemlist.cpp	Mon Mar 15 12:42:05 2010 +0200
@@ -266,7 +266,8 @@
             }
         else if ( currentIndex == EGSItemServiceProfile ||
             currentIndex == EGSItemCompression ||
-            currentIndex == EGSItemSecurity )
+            currentIndex == EGSItemSecurity ||
+            currentIndex == EGSItemRegistration )   
             {
             SetNextSettingItemL( currentIndex );
             aListBox->ActivateL();    
@@ -535,6 +536,21 @@
             iSecurity->LoadL();
             iSecurity->UpdateListBoxTextL();        
             break;
+            
+        case EGSItemRegistration:       
+        	iRegistration->StoreL();
+            if ( iProfileData.iRegistrationMode == EGSWhenNeeded )
+                {
+                iProfileData.iRegistrationMode = EGSAlwaysOn;
+                }
+            else
+                {
+                iProfileData.iRegistrationMode = EGSWhenNeeded;
+                }
+            iRegistration->LoadL();
+            iRegistration->UpdateListBoxTextL();        
+            break;
+            
         default:                    // Other setting items are not supported.
             User::Leave( KErrNotSupported );
             break;