diff --git a/src/message.hh b/src/message.hh
index 0b9d530..1d7808b 100644
--- a/src/message.hh
+++ b/src/message.hh
@@ -112,7 +112,8 @@ namespace pEp {
             dict opt_fields() { return strdict_attr(_msg->opt_fields); }
             void opt_fields(dict value) { return strdict_attr(_msg->opt_fields, value); }
 
-            PEP_enc_format enc_format;
+            PEP_enc_format enc_format() { return _msg->enc_format; }
+            void enc_format(PEP_enc_format value) { _msg->enc_format = value; }
         };
     }
 }
diff --git a/src/pEpmodule.cc b/src/pEpmodule.cc
index 54e9f56..8113b9b 100644
--- a/src/pEpmodule.cc
+++ b/src/pEpmodule.cc
@@ -133,6 +133,11 @@ BOOST_PYTHON_MODULE(pEp)
                 "comments added to message")
         .add_property("opt_fields", (dict(Message::*)()) &Message::opt_fields,
                 (void(Message::*)(dict)) &Message::opt_fields,
-                "opt_fields of message");
+                "opt_fields of message")
+        .add_property("enc_format", (int(Message::*)())
+                (PEP_enc_format(Message::*)()) &Message::enc_format,
+                (void(Message::*)(int))
+                (void(Message::*)(PEP_enc_format)) &Message::enc_format,
+                "0: unencrypted, 1: inline PGP, 2: S/MIME, 3: PGP/MIME, 4: p≡p format");
 }