diff --git a/gtk/main.c b/gtk/main.c
index 819195268..b7ef5869f 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -774,13 +774,12 @@ void linphone_gtk_answer_clicked(GtkWidget *button){
 
 void linphone_gtk_enable_video(GtkWidget *w){
 	gboolean val=gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(w));
-	GtkWidget *selfview_item=linphone_gtk_get_widget(linphone_gtk_get_main_window(),"selfview_item");
+	//GtkWidget *selfview_item=linphone_gtk_get_widget(linphone_gtk_get_main_window(),"selfview_item");
 	LinphoneVideoPolicy policy={0};
 	policy.automatically_initiate=policy.automatically_accept=val;
 	linphone_core_enable_video(linphone_gtk_get_core(),TRUE,TRUE);
 	linphone_core_set_video_policy(linphone_gtk_get_core(),&policy);
 	
-	gtk_widget_set_sensitive(selfview_item,val);
 	if (val){
 		linphone_core_enable_video_preview(linphone_gtk_get_core(),
 		linphone_gtk_get_ui_config_int("videoselfview",VIDEOSELFVIEW_DEFAULT));
@@ -1418,7 +1417,6 @@ static void linphone_gtk_check_menu_items(void){
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(linphone_gtk_get_widget(
 					linphone_gtk_get_main_window(),"enable_video_item")), video_enabled);
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(selfview_item),selfview);
-	gtk_widget_set_sensitive(selfview_item,video_enabled);
 }
 
 static gboolean linphone_gtk_can_manage_accounts(){
diff --git a/gtk/main.ui b/gtk/main.ui
index 96647fe4d..eebb05e75 100644
--- a/gtk/main.ui
+++ b/gtk/main.ui
@@ -498,7 +498,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
-                        <property name="label" translatable="yes">Enable video</property>
+                        <property name="label" translatable="yes">Always start video</property>
                         <property name="use_underline">True</property>
                         <signal name="toggled" handler="linphone_gtk_enable_video" swapped="no"/>
                       </object>
diff --git a/mediastreamer2 b/mediastreamer2
index 7e21fed93..43c192346 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 7e21fed93e1c35a721a63fc089cc53b9e503af62
+Subproject commit 43c1923468d962aa5577ebcf6d8674ef9d426e40