--- a/src/plugins/plugin_xep_0277.py	Tue Mar 15 16:25:42 2016 +0100
+++ b/src/plugins/plugin_xep_0277.py	Fri Mar 18 08:58:22 2016 +0100
@@ -181,7 +181,7 @@
 
 
         id_ = item_elt.getAttribute('id', '') # there can be no id for transient nodes
-        microblog_data['id'] = id_
+        microblog_data[u'id'] = id_
         if item_elt.uri not in (pubsub.NS_PUBSUB, NS_PUBSUB_EVENT):
             msg = u"Unsupported namespace {ns} in pubsub item {id_}".format(ns=item_elt.uri, id_=id_)
             log.warning(msg)
@@ -199,9 +199,9 @@
         except StopIteration:
             msg = u'No atom id found in the pubsub item {}, this is not standard !'.format(id_)
             log.warning(msg)
-            microblog_data['atom_id'] = ""
+            microblog_data[u'atom_id'] = ""
         else:
-            microblog_data['atom_id'] = unicode(id_elt)
+            microblog_data[u'atom_id'] = unicode(id_elt)
 
         # title/content(s)
 
@@ -233,18 +233,18 @@
                 log.warning(u"item {id_} provide a {key}_xhtml data but not a text one".format(id_=id_, key=key))
                 # ... and do the conversion if it's not
                 microblog_data[key] = yield self.host.plugins["TEXT-SYNTAXES"].\
-                                            convert(microblog_data['{}_xhtml'.format(key)],
+                                            convert(microblog_data[u'{}_xhtml'.format(key)],
                                             self.host.plugins["TEXT-SYNTAXES"].SYNTAX_XHTML,
                                             self.host.plugins["TEXT-SYNTAXES"].SYNTAX_TEXT,
                                             False)
 
         if 'content' not in microblog_data:
             # use the atom title data as the microblog body content
-            microblog_data['content'] = microblog_data['title']
-            del microblog_data['title']
+            microblog_data[u'content'] = microblog_data[u'title']
+            del microblog_data[u'title']
             if 'title_xhtml' in microblog_data:
-                microblog_data['content_xhtml'] = microblog_data['title_xhtml']
-                del microblog_data['title_xhtml']
+                microblog_data[u'content_xhtml'] = microblog_data[u'title_xhtml']
+                del microblog_data[u'title_xhtml']
 
         # published/updated dates
         try:
@@ -252,13 +252,13 @@
         except StopIteration:
             msg = u'No atom updated element found in the pubsub item {}'.format(id_)
             raise failure.Failure(exceptions.DataError(msg))
-        microblog_data['updated'] = unicode(rfc3339.tf_from_timestamp(unicode(updated_elt)))
+        microblog_data[u'updated'] = unicode(rfc3339.tf_from_timestamp(unicode(updated_elt)))
         try:
             published_elt = entry_elt.elements(NS_ATOM, 'published').next()
         except StopIteration:
-            microblog_data['published'] = microblog_data['updated']
+            microblog_data[u'published'] = microblog_data[u'updated']
         else:
-            microblog_data['published'] = unicode(rfc3339.tf_from_timestamp(unicode(published_elt)))
+            microblog_data[u'published'] = unicode(rfc3339.tf_from_timestamp(unicode(published_elt)))
 
         # links
         for link_elt in entry_elt.elements(NS_ATOM, 'link'):
@@ -271,8 +271,8 @@
                     log.warning(u"Can't parse url {}".format(microblog_data[key]))
                     del microblog_data[key]
                 else:
-                    microblog_data['{}_service'.format(key)] = service.full()
-                    microblog_data['{}_node'.format(key)] = node
+                    microblog_data[u'{}_service'.format(key)] = service.full()
+                    microblog_data[u'{}_node'.format(key)] = node
             else:
                 rel = link_elt.getAttribute('rel','')
                 title = link_elt.getAttribute('title','')
@@ -292,37 +292,37 @@
             except StopIteration:
                 log.warning(u"No name element found in author element of item {}".format(id_))
             else:
-                microblog_data['author'] = unicode(name_elt)
+                microblog_data[u'author'] = unicode(name_elt)
             # uri
             try:
                 uri_elt = author_elt.elements(NS_ATOM, 'uri').next()
             except StopIteration:
                 log.debug(u"No uri element found in author element of item {}".format(id_))
                 if publisher:
-                    microblog_data['author_jid'] =  publisher
+                    microblog_data[u'author_jid'] = publisher
             else:
                 uri = unicode(uri_elt)
                 if uri.startswith("xmpp:"):
                     uri = uri[5:]
-                    microblog_data['author_jid'] = uri
+                    microblog_data[u'author_jid'] = uri
                 else:
-                    microblog_data['author_jid'] = item_elt.getAttribute("publisher") or ""
+                    microblog_data[u'author_jid'] = item_elt.getAttribute(u"publisher") or ""
 
                 if not publisher:
                     log.debug(u"No publisher attribute, we can't verify author jid")
-                    microblog_data['author_jid_verified'] = C.BOOL_FALSE
+                    microblog_data[u'author_jid_verified'] = C.BOOL_FALSE
                 elif jid.JID(publisher).userhostJID() == jid.JID(uri).userhostJID():
-                    microblog_data['author_jid_verified'] = C.BOOL_TRUE
+                    microblog_data[u'author_jid_verified'] = C.BOOL_TRUE
                 else:
                     log.warning(u"item atom:uri differ from publisher attribute, spoofing attempt ? atom:uri = {} publisher = {}".format(uri, item_elt.getAttribute("publisher")))
-                    microblog_data['author_jid_verified'] = C.BOOL_FALSE
+                    microblog_data[u'author_jid_verified'] = C.BOOL_FALSE
             # email
             try:
                 email_elt = author_elt.elements(NS_ATOM, 'email').next()
             except StopIteration:
                 pass
             else:
-                microblog_data['author_email'] = unicode(email_elt)
+                microblog_data[u'author_email'] = unicode(email_elt)
 
             # categories
             categories = (category_elt.getAttribute('term','') for category_elt in entry_elt.elements(NS_ATOM, 'category'))