diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m
index bcc09cbcc..5fd63c4ec 100644
--- a/Classes/ChatRoomViewController.m
+++ b/Classes/ChatRoomViewController.m
@@ -273,6 +273,9 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
 	[chat setState:[NSNumber numberWithInt:state]];
 	[chat update];
 	[thiz.tableController updateChatEntry:chat];
+	linphone_chat_message_set_user_data(msg, NULL);
+	[chat release]; // no longuer need to keep reference
+	
 }
 
 - (BOOL)sendMessage:(NSString *)message withExterlBodyUrl:(NSURL*)externalUrl withInternalUrl:(NSURL*)internalUrl {
@@ -306,7 +309,7 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
     [chat release];
     
     LinphoneChatMessage* msg = linphone_chat_room_create_message(chatRoom, [message UTF8String]);
-	linphone_chat_message_set_user_data(msg, chat);
+	linphone_chat_message_set_user_data(msg, [chat retain]);
     if(externalUrl) {
         linphone_chat_message_set_external_body_url(msg, [[externalUrl absoluteString] UTF8String]);
     }
diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index b34093832..f6ab7e647 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -1017,7 +1017,7 @@ static void audioRouteChangeListenerCallback (
 
 - (void)addPushTokenToProxyConfig:(LinphoneProxyConfig*)proxyCfg{
 	NSData *tokenData =  pushNotificationToken;
-	if(tokenData != nil && [self lpConfigBoolForKey:@"pusnotification_preference"]) {
+	if(tokenData != nil && [self lpConfigBoolForKey:@"pushnotification_preference"]) {
 		const unsigned char *tokenBuffer = [tokenData bytes];
 		NSMutableString *tokenString = [NSMutableString stringWithCapacity:[tokenData length]*2];
 		for(int i = 0; i < [tokenData length]; ++i) {