diff --git a/src/common/helpers.py b/src/common/helpers.py
index c83da177a..0dbac4c40 100644
--- a/src/common/helpers.py
+++ b/src/common/helpers.py
@@ -46,6 +46,7 @@ import caps_cache
 import socket
 import time
 
+from gi.repository import GObject
 from encodings.punycode import punycode_encode
 from string import Template
 
@@ -474,6 +475,17 @@ def ensure_utf8_string(string):
         pass
     return string
 
+def wrapped_ensure_utf8_string(fn):
+    def wrapped(n):
+        return ensure_utf8_string(n)
+    return wrapped
+
+@wrapped_ensure_utf8_string
+def escape_text(text):
+    return GObject.markup_escape_text(text)
+
+GObject.markup_escape_text = escape_text
+
 def get_windows_reg_env(varname, default=''):
     """
     Ask for paths commonly used but not exposed as ENVs in english Windows 2003
diff --git a/src/tooltips.py b/src/tooltips.py
index 07191c506..a0e8f1fc5 100644
--- a/src/tooltips.py
+++ b/src/tooltips.py
@@ -487,11 +487,11 @@ class RosterTooltip(NotificationAreaTooltip):
         vcard_current_row = 1
         properties = []
 
-        name_markup = u'<span weight="bold">' + \
+        name_markup = '<span weight="bold">' + \
                 GObject.markup_escape_text(prim_contact.get_shown_name())\
                 + '</span>'
         if gajim.config.get('mergeaccounts'):
-            name_markup += u" <span foreground='%s'>(%s)</span>" % (
+            name_markup += " <span foreground='%s'>(%s)</span>" % (
                 gajim.config.get('tooltip_account_name_color'),
                 GObject.markup_escape_text(prim_contact.account.name))