diff --git a/gajim/common/storage/base.py b/gajim/common/storage/base.py
index da6e98d6eab05e8e728940005b22ce26e31ffe14..eb82dfae293aa5fbe621c6e7939ab52c9c43f920 100644
--- a/gajim/common/storage/base.py
+++ b/gajim/common/storage/base.py
@@ -49,8 +49,10 @@ def _adapt_common_error(common_error):
 sqlite3.register_converter('common_error', _convert_common_error)
 sqlite3.register_adapter(CommonError, _adapt_common_error)
 
+
 def _convert_marker(marker):
-    return 'received' if marker == 0 else 'displayed'
+    return 'received' if int(marker) == 0 else 'displayed'
+
 
 sqlite3.register_converter('marker', _convert_marker)
 
diff --git a/gajim/conversation_textview.py b/gajim/conversation_textview.py
index 7da5601650d10a072038578e14d0f1facdadd2db..508b014d056912c34e8956152198b65eded2852d 100644
--- a/gajim/conversation_textview.py
+++ b/gajim/conversation_textview.py
@@ -964,7 +964,10 @@ def print_conversation_line(self, text, kind, name, tim,
             message_line.set_error(to_user_string(error))
 
         if marker is not None:
-            message_line.set_receipt()
+            if marker == 'received':
+                message_line.set_receipt()
+            elif marker == 'displayed':
+                message_line.set_displayed()
 
         if index is None:
             # New Message