diff --git a/src/org/linphone/InCallActivity.java b/src/org/linphone/InCallActivity.java
index fd1135115..a4be92910 100644
--- a/src/org/linphone/InCallActivity.java
+++ b/src/org/linphone/InCallActivity.java
@@ -85,7 +85,7 @@ public class InCallActivity extends FragmentActivity implements OnClickListener
 	private StatusFragment status;
 	private AudioCallFragment audioCallFragment;
 	private VideoCallFragment videoCallFragment;
-	private boolean isSpeakerEnabled = false, isMicMuted = false,  isTransferAllowed, isAnimationDisabled;
+	private boolean isSpeakerEnabled = false, isMicMuted = false, isTransferAllowed, isAnimationDisabled;
 	private ViewGroup mControlsLayout;
 	private Numpad numpad;
 	private int cameraNumber;
@@ -432,8 +432,10 @@ public class InCallActivity extends FragmentActivity implements OnClickListener
 		addCall.setEnabled(LinphoneManager.getLc().getCallsNb() < LinphoneManager.getLc().getMaxCalls());
 		transfer.setEnabled(getResources().getBoolean(R.bool.allow_transfers));
 		options.setEnabled(!getResources().getBoolean(R.bool.disable_options_in_call) && (addCall.isEnabled() || transfer.isEnabled()));
-		
-		//video.setEnabled(true);
+
+		if(LinphoneManager.getLc().getCurrentCall() != null && LinphonePreferences.instance().isVideoEnabled() && !LinphoneManager.getLc().getCurrentCall().mediaInProgress()) {
+			video.setEnabled(true);
+		}
 		micro.setEnabled(true);
 		if(!isTablet()){
 			speaker.setEnabled(true);