diff --git a/src/com/savoirfairelinux/sflphone/client/CallActivity.java b/src/com/savoirfairelinux/sflphone/client/CallActivity.java
index 643234efe9c4c0a8535f45810af0c8f968ffd923..6d31e6fc5e7249ab839691bab092f063289f466a 100644
--- a/src/com/savoirfairelinux/sflphone/client/CallActivity.java
+++ b/src/com/savoirfairelinux/sflphone/client/CallActivity.java
@@ -130,7 +130,8 @@ public class CallActivity extends Activity implements OnClickListener
                 break;
             case R.id.buttonhangup:
                 if((mCall.getCallStateInt() == SipCall.CALL_STATE_NONE) ||
-                   (mCall.getCallStateInt() == SipCall.CALL_STATE_CURRENT)) {
+                   (mCall.getCallStateInt() == SipCall.CALL_STATE_CURRENT) ||
+                   (mCall.getCallStateInt() == SipCall.CALL_STATE_HOLD)) {
                     mCall.notifyServiceHangup(service);
                     finish();
                 }
@@ -140,13 +141,11 @@ public class CallActivity extends Activity implements OnClickListener
                 }
                 break;
             case R.id.buttonhold:
-                Log.i(TAG, "HOLDBUTTONCLICK call state " + mCall.getCallStateString());
                 if(mCall.getCallStateInt() == SipCall.CALL_STATE_CURRENT) {
                     mCall.notifyServiceHold(service);
                 }
                 break;
             case R.id.buttonunhold:
-                Log.i(TAG, "UNHOLDBUTTONCLICK call state " + mCall.getCallStateString());
                 if(mCall.getCallStateInt() == SipCall.CALL_STATE_HOLD) {
                     mCall.notifyServiceUnhold(service);
                 }