diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 74209dedd..20eb1d536 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -1036,7 +1036,7 @@ define([
             }
         },
         //arrowType: 'round',
-        dynamicTitle: true,
+        dynamicTitle: false,
         arrowTransform: 'scale(2)',
         zIndex: 100000001
     });
@@ -1079,6 +1079,7 @@ define([
                     }
                 }
                 if (mutation.type === "attributes" && mutation.attributeName === "title") {
+                    mutation.target.fixHTML = false;
                     addTippy(0, mutation.target);
                 }
             });
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index e1264b853..8154ad71f 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -2778,7 +2778,7 @@ define([
                 common.displayAvatar($(avatar), data.avatar, data.name);
                 return h('div.cp-creation-team', {
                     'data-id': id,
-                    title: Util.fixHTML(data.name),
+                    title: data.name,
                 },[
                     avatar,
                     h('span.cp-creation-team-name', data.name)
diff --git a/www/common/messenger-ui.js b/www/common/messenger-ui.js
index 4a64f186e..a21a84fad 100644
--- a/www/common/messenger-ui.js
+++ b/www/common/messenger-ui.js
@@ -831,7 +831,6 @@ define([
             var md = common.getMetadataMgr().getMetadata();
             var name = md.title || md.defaultTitle;
             $userlist.find(dataQuery(padChat)).find('.cp-app-contacts-name').text(name);
-            $userlist.find(dataQuery(padChat)).attr('title', name);
             $messages.find(dataQuery(padChat) + ' .cp-app-contacts-header .cp-app-contacts-name')
                 .text(name);