diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 7cc1edf23..6ff983bbc 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -6465,3 +6465,13 @@ JNIEXPORT void JNICALL Java_org_linphone_core_TunnelConfigImpl_destroy(JNIEnv *e
 }
 
 
+/*
+ * Class:     org_linphone_core_LinphoneCallLogImpl
+ * Method:    getCallId
+ * Signature: (J)I
+ */
+JNIEXPORT jstring JNICALL Java_org_linphone_core_LinphoneCallLogImpl_getCallId(JNIEnv *env, jobject jobj, jlong pcl){
+	const char *str = linphone_call_log_get_call_id((LinphoneCallLog*)pcl);
+	return str ? env->NewStringUTF(str) : NULL;
+}
+
diff --git a/java/common/org/linphone/core/LinphoneCallLog.java b/java/common/org/linphone/core/LinphoneCallLog.java
index f1dd742b3..67b1977e1 100644
--- a/java/common/org/linphone/core/LinphoneCallLog.java
+++ b/java/common/org/linphone/core/LinphoneCallLog.java
@@ -118,7 +118,7 @@ public interface LinphoneCallLog {
 	public int getCallDuration();
 	/**
 	 *  Call id from signaling
-	 * @return int
+	 * @return the SIP call-id.
 	 */
-	public int getCallId();
+	public String getCallId();
 }
diff --git a/java/impl/org/linphone/core/LinphoneCallLogImpl.java b/java/impl/org/linphone/core/LinphoneCallLogImpl.java
index 7078a2a9f..3c78e4046 100644
--- a/java/impl/org/linphone/core/LinphoneCallLogImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCallLogImpl.java
@@ -29,7 +29,7 @@ class LinphoneCallLogImpl implements LinphoneCallLog {
 	private native int getStatus(long nativePtr);
 	private native String getStartDate(long nativePtr);
 	private native int getCallDuration(long nativePtr);
-	private native int getCallId(long nativePtr);
+	private native String getCallId(long nativePtr);
 	private native long getTimestamp(long nativePtr);
 	
 	LinphoneCallLogImpl(long aNativePtr)  {
@@ -62,7 +62,7 @@ class LinphoneCallLogImpl implements LinphoneCallLog {
 	public int getCallDuration() {
 		return getCallDuration(nativePtr);
 	}
-	public int getCallId() {
+	public String getCallId() {
 		return getCallId(nativePtr);
 	}