diff --git a/LinphoneCallParamsImpl.java b/LinphoneCallParamsImpl.java
index 8a7fba15c..bb7e9b1ab 100644
--- a/LinphoneCallParamsImpl.java
+++ b/LinphoneCallParamsImpl.java
@@ -18,6 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 package org.linphone.core;
 
+import org.linphone.core.LinphoneCore.MediaEncryption;
+
 public class LinphoneCallParamsImpl implements LinphoneCallParams {
 	protected final long nativePtr;
 	
@@ -28,8 +30,8 @@ public class LinphoneCallParamsImpl implements LinphoneCallParams {
 	private native void enableVideo(long nativePtr, boolean b);
 	private native boolean getVideoEnabled(long nativePtr);
 	private native void audioBandwidth(long nativePtr, int bw);
-	private native void setMediaEncryption(long nativePtr, String menc);
-	private native String getMediaEncryption(long nativePtr);
+	private native void setMediaEncryption(long nativePtr, int menc);
+	private native int getMediaEncryption(long nativePtr);
 	private native void destroy(long nativePtr);
 	
 	
@@ -51,12 +53,12 @@ public class LinphoneCallParamsImpl implements LinphoneCallParams {
 		audioBandwidth(nativePtr, value);
 	}
 	
-	public String getMediaEncryption() {
-		return getMediaEncryption(nativePtr);
+	public MediaEncryption getMediaEncryption() {
+		return MediaEncryption.fromInt(getMediaEncryption(nativePtr));
 	}
 	
-	public void setMediaEnctyption(String menc) {
-		setMediaEncryption(nativePtr, menc);
+	public void setMediaEnctyption(MediaEncryption menc) {
+		setMediaEncryption(nativePtr, menc.mValue);
 	}
 
 	private native boolean localConferenceMode(long nativePtr);
diff --git a/LinphoneCoreImpl.java b/LinphoneCoreImpl.java
index 363ac8ac4..eeb082dca 100644
--- a/LinphoneCoreImpl.java
+++ b/LinphoneCoreImpl.java
@@ -105,8 +105,8 @@ class LinphoneCoreImpl implements LinphoneCore {
 	private native void enableEchoLimiter(long nativePtr2, boolean val);
 	private native int setVideoDevice(long nativePtr2, int id);
 	private native int getVideoDevice(long nativePtr2);
-	private native String getMediaEncryption(long nativePtr);
-	private native void setMediaEncryption(long nativePtr, String menc);
+	private native int getMediaEncryption(long nativePtr);
+	private native void setMediaEncryption(long nativePtr, int menc);
 	private native boolean isMediaEncryptionMandatory(long nativePtr);
 	private native void setMediaEncryptionMandatory(long nativePtr, boolean yesno);
 	
@@ -571,14 +571,14 @@ class LinphoneCoreImpl implements LinphoneCore {
 		return (LinphoneCall) findCallFromUri(nativePtr, uri);
 	}
 
-	public String getMediaEncryption() {
-		return getMediaEncryption(nativePtr);
+	public MediaEncryption getMediaEncryption() {
+		return MediaEncryption.fromInt(getMediaEncryption(nativePtr));
 	}
 	public boolean isMediaEncryptionMandatory() {
 		return isMediaEncryptionMandatory(nativePtr);
 	}
-	public void setMediaEncryption(String menc) {
-		setMediaEncryption(nativePtr, menc);		
+	public void setMediaEncryption(MediaEncryption menc) {
+		setMediaEncryption(nativePtr, menc.mValue);	
 	}
 	public void setMediaEncryptionMandatory(boolean yesno) {
 		setMediaEncryptionMandatory(nativePtr, yesno);
@@ -610,4 +610,9 @@ class LinphoneCoreImpl implements LinphoneCore {
 	public boolean isEchoLimiterEnabled() {
 		return isEchoLimiterEnabled(nativePtr);
 	}
+	private native boolean mediaEncryptionSupported(long nativePtr, int menc);
+	@Override
+	public boolean mediaEncryptionSupported(MediaEncryption menc) {
+		return mediaEncryptionSupported(nativePtr,menc.mValue);
+	}
 }