diff -r 307788aac0a8 -r 8248b03a2669 realtimenetprots/sipfw/ClientResolver/Resolver/src/CSIPOptionsHandler.cpp
--- a/realtimenetprots/sipfw/ClientResolver/Resolver/src/CSIPOptionsHandler.cpp	Tue Feb 02 01:03:15 2010 +0200
+++ b/realtimenetprots/sipfw/ClientResolver/Resolver/src/CSIPOptionsHandler.cpp	Fri Apr 16 15:18:54 2010 +0300
@@ -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;
     }