diff --git a/docs/source/conf.py b/docs/source/conf.py
index 20a3965e08..74590b528c 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -195,6 +195,10 @@ intersphinx_mapping = {'https://docs.python.org/': None}
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = True
 
+autodoc_default_options = {
+    'inherited-members': True,
+}
+
 autodoc_mock_imports = ['googlesamples.assistant.grpc.audio_helpers',
                         'google.assistant.embedded',
                         'google.assistant.library',
diff --git a/platypush/message/__init__.py b/platypush/message/__init__.py
index 5ae71077d6..c79bee4b1e 100644
--- a/platypush/message/__init__.py
+++ b/platypush/message/__init__.py
@@ -20,7 +20,9 @@ class JSONAble(ABC):
 
 
 class Message(object):
-    """ Message generic class """
+    """
+    Message generic class
+    """
 
     class Encoder(json.JSONEncoder):
         @staticmethod