diff --git a/src/message.hh b/src/message.hh
index d34f87b..9468ac6 100644
--- a/src/message.hh
+++ b/src/message.hh
@@ -103,7 +103,9 @@ namespace pEp {
             list references() { return strlist_attr(_msg->references); }
             void references(list value) { strlist_attr(_msg->references, value); }
 
-            stringlist_t *keywords;
+            list keywords() { return strlist_attr(_msg->keywords); }
+            void keywords(list value) { strlist_attr(_msg->keywords, value); }
+
             char *comments;
             stringpair_list_t *opt_fields;
             PEP_enc_format enc_format;
diff --git a/src/pEpmodule.cc b/src/pEpmodule.cc
index 0b059e6..9ff5d26 100644
--- a/src/pEpmodule.cc
+++ b/src/pEpmodule.cc
@@ -124,6 +124,9 @@ BOOST_PYTHON_MODULE(pEp)
                 "in_reply_to list")
         .add_property("references", (list(Message::*)()) &Message::references,
                 (void(Message::*)(list)) &Message::references,
-                "message references");
+                "message IDs of messages this one is referring to")
+        .add_property("keywords", (list(Message::*)()) &Message::keywords,
+                (void(Message::*)(list)) &Message::keywords,
+                "keywords this message should be stored under");
 }