--- a/telephonyserver/etelserverandcore/SETEL/ET_CORE.CPP	Fri Jun 04 13:03:15 2010 +0100
+++ b/telephonyserver/etelserverandcore/SETEL/ET_CORE.CPP	Thu Oct 07 19:32:01 2010 +0300
@@ -929,7 +929,6 @@
 	return NULL;
 	}
 
-/*
 EXPORT_C TInt CPhoneBase::FindSessionByTsyHandle(const TTsyReqHandle aTsyReqHandle)
 	{
 	CReqEntry* reqEntry = FindByTsyHandle(aTsyReqHandle);
@@ -952,7 +951,7 @@
 		}
 	return reqEntry->iMessage.Int3();
 	}
-*/
+
 void CPhoneBase::UpdateBuffer(CReqEntry* aUpdatedReqEntry,CReqEntry* aReqEntry)
 //
 //	Is passed both the TSY-updated request entry (which may be multi-buffered or not)
@@ -1357,7 +1356,7 @@
 				SetActive();
 				break;
 			case EInterestCategoryDefault:
-				// wait on default client (no timeout) //TODO: What if the default client doesn't respond? (Neil)
+				// wait on default client (no timeout)
 				break;
 			default:
                 // No more clients
@@ -1461,11 +1460,13 @@
 TBool CMmDeliveryObject::DeliveryInProgress() const
 	{
 	// In the case of delivery to the default client we won't be active when
-	// delivery is carried out as no timeout is used for the default client -
-	// TODO is it correct that the default client should have no timeout?
+	// delivery is carried out as no timeout is used for the default client
 	return (IsActive() || iCurrentReq);
 	}
-
+CTelObject::TReqMode CMmDeliveryObject::GetReqMode()const 
+	{
+	return iReqMode;
+	}
 TInt CMmDeliveryObject::ClientsDecision( const RMessage2& aMessage, CTelSession* aSession, TBool aAccepted )
 	{
 	if (!DeliveryInProgress())