diff --git a/docker/Dockerfile b/docker/Dockerfile
index 85a477f63..39b4d2bd2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -108,6 +108,15 @@ RUN apt-get install -qy \
 	zile \
 	zlib1g-dev
 
+# Postgresql packages
+RUN apt-get install -qy \
+        postgresql-11 \
+        postgresql-server-dev-11 
+
+RUN pip install \
+        psycopg2
+        
+
 # Get the key used to sign the libyang repo
 RUN wget -nv http://download.opensuse.org/repositories/home:liberouter/Debian_9.0/Release.key
 RUN apt-key add - < Release.key
diff --git a/ietf/nomcom/utils.py b/ietf/nomcom/utils.py
index b0d86c35c..bf7263720 100644
--- a/ietf/nomcom/utils.py
+++ b/ietf/nomcom/utils.py
@@ -437,7 +437,7 @@ def get_body(message):
                                                              'plain')]
         body = []
         for part in text_parts:
-            charset = get_charset(message)
+            charset = get_charset(part)
             body.append(get_payload_text(part, default_charset=charset))
 
         return "\n".join(body).strip()