--- 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;
     }