diff --git a/sflphone-common/src/managerimpl.cpp b/sflphone-common/src/managerimpl.cpp
index da9bbcf51f4c5b0d39c2541c9d25035863727533..d4000073edc94d44cffa51398cd46efb31487849 100644
--- a/sflphone-common/src/managerimpl.cpp
+++ b/sflphone-common/src/managerimpl.cpp
@@ -2556,28 +2556,22 @@ void ManagerImpl::setVolumeControls (bool display) {
 }
 
 void ManagerImpl::setRecordingCall (const CallID& id) {
-  /*
-    _debug ("ManagerImpl::setRecording()! ");
-    AccountID accountid = getAccountFromCall (id);
-    
-    getAccountLink (accountid)->setRecording (id);
-  */
 
-  AccountID accountid = getAccountFromCall(id);
-  Recordable* rec = (Recordable *) getAccountLink(accountid)->getCall(id);
+  Recordable* rec;
+  if(!isConference(id)) {
+    AccountID accountid = getAccountFromCall(id);
+    rec = (Recordable *) getAccountLink(accountid)->getCall(id);
+  }
+  else {
+    ConferenceMap::iterator it = _conferencemap.find(id);
+    rec = (Recordable *)it->second;
+  }
 
   rec->setRecording();
 
-	
 }
 
 bool ManagerImpl::isRecording (const CallID& id) {
-	/*
-	 _debug ("ManagerImpl::isRecording()! ");
-	 AccountID accountid = getAccountFromCall (id);
-
-	 return getAccountLink (accountid)->isRecording (id);
-	 */
 
 	AccountID accountid = getAccountFromCall(id);
 	Recordable* rec = (Recordable*) getAccountLink(accountid)->getCall(id);