diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index dbed18003..59c46fee2 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -3279,6 +3279,7 @@ int linphone_core_update_call(LinphoneCore *lc, LinphoneCall *call, const Linpho
 #ifdef VIDEO_ENABLED
 		if ((call->videostream != NULL) && (call->state == LinphoneCallStreamsRunning)) {
 			video_stream_set_sent_video_size(call->videostream,linphone_core_get_preferred_video_size(lc));
+			video_stream_set_fps(call->videostream, linphone_core_get_preferred_framerate(lc));
 			if (call->camera_enabled && call->videostream->cam!=lc->video_conf.device){
 				video_stream_change_camera(call->videostream,lc->video_conf.device);
 			}else video_stream_update_video_params(call->videostream);
diff --git a/coreapi/message_storage.c b/coreapi/message_storage.c
index 7caf4536b..d2f83b12a 100644
--- a/coreapi/message_storage.c
+++ b/coreapi/message_storage.c
@@ -54,6 +54,7 @@ static inline LinphoneChatMessage* get_transient_message(LinphoneChatRoom* cr, u
 static void create_chat_message(char **argv, void *data){
 	LinphoneChatRoom *cr = (LinphoneChatRoom *)data;
 	LinphoneAddress *from;
+	LinphoneAddress *to;
 
 	unsigned int storage_id = atoi(argv[0]);
 
@@ -65,12 +66,18 @@ static void create_chat_message(char **argv, void *data){
 		if(atoi(argv[3])==LinphoneChatMessageIncoming){
 			new_message->dir=LinphoneChatMessageIncoming;
 			from=linphone_address_new(argv[2]);
+			to=linphone_address_new(argv[1]);
 		} else {
 			new_message->dir=LinphoneChatMessageOutgoing;
 			from=linphone_address_new(argv[1]);
+			to=linphone_address_new(argv[2]);
 		}
 		linphone_chat_message_set_from(new_message,from);
 		linphone_address_destroy(from);
+		if (to){
+			linphone_chat_message_set_to(new_message,to);
+			linphone_address_destroy(to);
+		}
 
 		if( argv[9] != NULL ){
 			new_message->time = (time_t)atol(argv[9]);