diff --git a/src/gen_cpp_Engine.ysl2 b/src/gen_cpp_Engine.ysl2
index 9a5a3b3..cbf5c58 100644
--- a/src/gen_cpp_Engine.ysl2
+++ b/src/gen_cpp_Engine.ysl2
@@ -264,6 +264,8 @@ tstylesheet {
                 > &_«$name»
             when "$dir = 'inout' and $type='int'"
                 > (unsigned int *) &_«$name»
+            when "$dir = 'inout' and $type='stringlist'"
+                > &_«$name»
             otherwise 
                 > _«$name»
         }
diff --git a/src/pEp.yml2 b/src/pEp.yml2
index 08f2355..81e690b 100644
--- a/src/pEp.yml2
+++ b/src/pEp.yml2
@@ -126,6 +126,7 @@ namespace pEp {
         PEP_decrypt_flag_consumed > 2
         PEP_decrypt_flag_ignored > 4
         PEP_decrypt_flag_src_modified > 8
+        PEP_decrypt_flag_untrusted_server > 0x100
     };
 
     enum IdentityFlags {
@@ -181,7 +182,7 @@ namespace pEp {
         method decrypt_message(
                 inout message src,
                 creates message dst,
-                creates stringlist keylist,
+                inout stringlist keylist,
                 returns Rating rating,
                 inout int flags
             );