diff --git a/src/com/savoirfairelinux/sflphone/client/SipCall.java b/src/com/savoirfairelinux/sflphone/client/SipCall.java
index 55b6d42ca40a29dad4dc0847210e9c430fff8914..70bd65b7426f38c1a701a1bd66f81492b69c1b1f 100644
--- a/src/com/savoirfairelinux/sflphone/client/SipCall.java
+++ b/src/com/savoirfairelinux/sflphone/client/SipCall.java
@@ -206,41 +206,12 @@ public class SipCall
 
     public void setCallState(int callState) {
         mCallInfo.mCallState = callState;
-       
+      
+        // Check if this call is associated to a view in CallElementList 
         if(mRowView == null)
             return;
 
-        String state;
-
-        switch(mCallInfo.mCallState) {
-            case CALL_STATE_INCOMING:
-                state = "INCOMING";
-                break;
-            case CALL_STATE_RINGING:
-                state = "RINGING";
-                break;
-            case CALL_STATE_CURRENT:
-                state = "CURRENT";
-                break;
-            case CALL_STATE_HUNGUP:
-                state = "HUNGUP";
-                break;
-            case CALL_STATE_BUSY:
-                state = "BUSY";
-                break;
-            case CALL_STATE_FAILURE:
-                state = "FAILURE";
-                break;
-            case CALL_STATE_HOLD:
-                state = "HOLD";
-                break;
-            case CALL_STATE_UNHOLD:
-                state = "UNHOLD";
-                break;
-            default:
-                state = "NULL";
-        }
-
+        // Update the state to the view
         CallElementView entryView = (CallElementView) mRowView.getTag();
         final String CURRENT_STATE_LABEL = "    CURRENT STATE: ";
         entryView.state.setText(CURRENT_STATE_LABEL + getCallStateString());