diff --git a/coreapi/friend.c b/coreapi/friend.c
index 158317612..2aa0db7cf 100644
--- a/coreapi/friend.c
+++ b/coreapi/friend.c
@@ -406,6 +406,8 @@ void linphone_friend_apply(LinphoneFriend *fr, LinphoneCore *lc){
 	if (fr->subscribe && fr->subscribe_active==FALSE){
 		ms_message("Sending a new SUBSCRIBE");
 		__linphone_friend_do_subscribe(fr);
+	}else if (fr->subscribe_active && !fr->subscribe){
+		linphone_friend_unsubscribe(fr);
 	}
 	ms_message("linphone_friend_apply() done.");
 	lc->bl_refresh=TRUE;
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 08d30d2d8..2c3feefa1 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -5017,7 +5017,9 @@ static MSVideoSizeDef supported_resolutions[]={
 	{	{MS_VIDEO_SIZE_SVGA_W,MS_VIDEO_SIZE_SVGA_H}	,	"svga"	},
 	{	{MS_VIDEO_SIZE_4CIF_W,MS_VIDEO_SIZE_4CIF_H}	,	"4cif"	},
 	{	{MS_VIDEO_SIZE_VGA_W,MS_VIDEO_SIZE_VGA_H}	,	"vga"	},
+#ifdef __ios
 	{	{MS_VIDEO_SIZE_IOS_MEDIUM_H,MS_VIDEO_SIZE_IOS_MEDIUM_W}	,	"ios-medium"	},
+#endif
 	{	{MS_VIDEO_SIZE_CIF_W,MS_VIDEO_SIZE_CIF_H}	,	"cif"	},
 	{	{MS_VIDEO_SIZE_QVGA_W,MS_VIDEO_SIZE_QVGA_H}	,	"qvga"	},
 	{	{MS_VIDEO_SIZE_QCIF_W,MS_VIDEO_SIZE_QCIF_H}	,	"qcif"	},	
diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index 275aa1bfd..08df88bb6 100644
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -849,7 +849,7 @@ int linphone_proxy_config_send_publish(LinphoneProxyConfig *proxy, LinphonePrese
 			sal_op_set_from(proxy->publish_op,linphone_proxy_config_get_identity(proxy));
 			sal_op_set_to(proxy->publish_op,linphone_proxy_config_get_identity(proxy));
 			if (lp_config_get_int(proxy->lc->config,"sip","publish_msg_with_contact",0)){
-				SalAddress *addr=sal_address_new(NULL);
+				SalAddress *addr=sal_address_new(linphone_proxy_config_get_identity(proxy));
 				sal_op_set_contact(proxy->publish_op,addr);
 				sal_address_unref(addr);
 			}
@@ -1182,14 +1182,12 @@ void linphone_proxy_config_update(LinphoneProxyConfig *cfg){
 		}
 		if (can_register(cfg)){
 			linphone_proxy_config_register(cfg);
-			ms_message("***Registering...(%p)",cfg);
 			cfg->commit=FALSE;
 			if (cfg->publish) cfg->send_publish=TRUE;
 		}
 	}
 	if (cfg->send_publish && (cfg->state==LinphoneRegistrationOk || cfg->state==LinphoneRegistrationCleared)){
 		linphone_proxy_config_send_publish(cfg,lc->presence_model);
-		ms_message("***Publishing...");
 		cfg->send_publish=FALSE;
 	}
 }
diff --git a/mediastreamer2 b/mediastreamer2
index ec2d04150..7c4bfcb0b 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit ec2d04150521197905bf5812991b54bab97fbdf8
+Subproject commit 7c4bfcb0baf9ebc0e6edd94fc46b7a512fb733bf