diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index c3083289d..65218dc7f 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -35,6 +35,7 @@ extern "C" {
 #include "linphone/core.h"
 #include "linphone/tunnel.h"
 #include "linphone/account_creator.h"
+#include "linphone/wrapper_utils.h"
 
 #include "private.h" /*Included for multicast and wifi lock management by linphonecore. Very ugly.*/
 #include <cpu-features.h>
@@ -4605,7 +4606,7 @@ extern "C" jboolean Java_org_linphone_core_LinphoneChatMessageImpl_isSecured(JNI
 extern "C" void Java_org_linphone_core_LinphoneChatMessageImpl_reSend(JNIEnv*  env
 																		,jobject  thiz
 																		,jlong ptr) {
-	linphone_chat_message_resend((LinphoneChatMessage*)ptr);
+	linphone_chat_message_resend_2((LinphoneChatMessage*)ptr);
 }
 
 static void message_state_changed(LinphoneChatMessage* msg, LinphoneChatMessageState state) {
@@ -4834,9 +4835,8 @@ extern "C" void Java_org_linphone_core_LinphoneChatRoomImpl_sendChatMessage(JNIE
 																		,jobject message
 																		,jlong messagePtr) {
 	message = env->NewGlobalRef(message);
-	linphone_chat_message_ref((LinphoneChatMessage*)messagePtr);
 	linphone_chat_message_set_user_data((LinphoneChatMessage*)messagePtr, message);
-	linphone_chat_room_send_chat_message((LinphoneChatRoom*)chatroom_ptr, (LinphoneChatMessage*)messagePtr);
+	linphone_chat_room_send_chat_message_2((LinphoneChatRoom*)chatroom_ptr, (LinphoneChatMessage*)messagePtr);
 }
 
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setVideoWindowId(JNIEnv* env
diff --git a/include/linphone/wrapper_utils.h b/include/linphone/wrapper_utils.h
index 5c05a1cc0..d9990aa50 100644
--- a/include/linphone/wrapper_utils.h
+++ b/include/linphone/wrapper_utils.h
@@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-/* 
+/*
  * That file declares functions that are used by automatic API wrapper generators. These
  * should not be used by C API users.
  */
@@ -38,7 +38,7 @@ extern "C" {
 
 /**
  * Send a message to peer member of this chat room.
- * 
+ *
  * The state of the sending message will be notified via the callbacks defined in the #LinphoneChatMessageCbs object that can be obtained
  * by calling linphone_chat_message_get_callbacks().
  * @note Unlike linphone_chat_room_send_chat_message(), that function only takes a reference on the #LinphoneChatMessage
@@ -58,7 +58,7 @@ LINPHONE_PUBLIC void linphone_chat_room_send_chat_message_2(LinphoneChatRoom *cr
  *
  * @param[in] msg LinphoneChatMessage object
  */
-LINPHONE_PUBLIC void linphone_chat_message_resend(LinphoneChatMessage *msg);
+LINPHONE_PUBLIC void linphone_chat_message_resend_2(LinphoneChatMessage *msg);
 
 /**
  * Accessor for the shared_ptr&lt;BelCard&gt; stored by a #LinphoneVcard