diff --git a/src/codegen/pEp.yml2 b/src/codegen/pEp.yml2
index 9ba1474..96ec75c 100644
--- a/src/codegen/pEp.yml2
+++ b/src/codegen/pEp.yml2
@@ -114,11 +114,10 @@ namespace pEp {
             );
 
         method cached=true decrypt_message(
-                inout message src,
+                in message src,
                 creates message dst,
-                inout stringlist keylist,
-                returns Rating rating,
-                inout int flags
+                creates stringlist keylist,
+                in DecryptFlags flags
             );
 
         method cached=true re_evaluate_message_rating(
diff --git a/src/cxx/jniutils.cc b/src/cxx/jniutils.cc
index 3d3b2ad..34cc919 100644
--- a/src/cxx/jniutils.cc
+++ b/src/cxx/jniutils.cc
@@ -233,6 +233,14 @@ int to_Integer(JNIEnv *env,
     return _val;
 }
 
+PEP_decrypt_flags_t *to_DecryptFlags(JNIEnv *env,
+        jobject flags)
+{
+    PEP_decrypt_flags_t *_val;
+    (*_val) = (PEP_decrypt_flags_t)1;
+    return _val;
+}
+
 jbyteArray from_string(JNIEnv *env,
         const char *str)
 {
diff --git a/src/cxx/jniutils.hh b/src/cxx/jniutils.hh
index 747d55a..bc90ac3 100644
--- a/src/cxx/jniutils.hh
+++ b/src/cxx/jniutils.hh
@@ -85,6 +85,9 @@ jobject from_Integer(JNIEnv *env,
 int to_Integer(JNIEnv *env,
         jobject obj);
 
+PEP_decrypt_flags_t *to_DecryptFlags(JNIEnv *env,
+        jobject flags);
+
 jbyteArray from_string(JNIEnv *env,
         const char *str);
 
diff --git a/src/java/foundation/pEp/jniadapter/decrypt_message_Return.java b/src/java/foundation/pEp/jniadapter/decrypt_message_Return.java
index e59aae9..8343b68 100644
--- a/src/java/foundation/pEp/jniadapter/decrypt_message_Return.java
+++ b/src/java/foundation/pEp/jniadapter/decrypt_message_Return.java
@@ -1,7 +1,9 @@
 package foundation.pEp.jniadapter;
 
+import java.util.Vector;
+
 public class decrypt_message_Return {
     public Message dst;
-    public Rating rating;
-    public int flags;
+    public Vector<String> keylist;
+    public DecryptFlags flags;
 }