diff --git a/src/message.hh b/src/message.hh
index 9468ac6..214528c 100644
--- a/src/message.hh
+++ b/src/message.hh
@@ -106,7 +106,9 @@ namespace pEp {
             list keywords() { return strlist_attr(_msg->keywords); }
             void keywords(list value) { strlist_attr(_msg->keywords, value); }
 
-            char *comments;
+            string comments() { return str_attr(_msg->comments); }
+            void comments(string value) { str_attr(_msg->comments, value); }
+
             stringpair_list_t *opt_fields;
             PEP_enc_format enc_format;
         };
diff --git a/src/pEpmodule.cc b/src/pEpmodule.cc
index 9ff5d26..cb7bb93 100644
--- a/src/pEpmodule.cc
+++ b/src/pEpmodule.cc
@@ -127,6 +127,9 @@ BOOST_PYTHON_MODULE(pEp)
                 "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");
+                "keywords this message should be stored under")
+        .add_property("comments", (string(Message::*)()) &Message::comments,
+                (void(Message::*)(string)) &Message::comments,
+                "comments added to message");
 }