diff --git a/content.py b/content.py
index 05352283..0a513a96 100644
--- a/content.py
+++ b/content.py
@@ -89,12 +89,12 @@ def addEmoji(baseDir: str,wordStr: str,httpPrefix: str,domain: str,replaceEmoji:
         return False
     emojiUrl=httpPrefix+"://"+domain+"/emoji/"+emojiDict[emoji]+'.png'
     postTags[emoji]= {
-        'href': emojiUrl,
+        'id': emojiUrl,
         'name': ':'+emoji+':',
         'type': 'Emoji'
     }
-    replaceEmoji[wordStr]= \
-        "<img src=\""+emojiUrl+"\" alt=\""+emoji+"\" align=\"middle\" class=\"emoji\"/>"
+    #replaceEmoji[wordStr]= \
+    #    "<img src=\""+emojiUrl+"\" alt=\""+emoji+"\" align=\"middle\" class=\"emoji\"/>"
     return True
 
 def addMention(wordStr: str,httpPrefix: str,following: str,replaceMentions: {},recipients: [],tags: {}) -> bool:
diff --git a/webinterface.py b/webinterface.py
index a5e35cc1..e8f4605d 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -940,6 +940,24 @@ def contentWarningScript() -> str:
         '}'
     return script
 
+def htmlRemplaceEmojiFromTags(content: str,tag: {}) -> str:
+    """Uses the tags to replace :emoji: with html image markup
+    """
+    for tagItem in tag:
+        if not tagItem.get('id'):
+            continue
+        if not tagItem.get('type'):
+            continue
+        if not tagItem.get('name'):
+            continue
+        if tagItem['type']!='Emoji':
+            continue
+        if tagItem['name'] not in content:
+            continue
+        emojiHtml="<img src=\""+tagItem['id']+"\" alt=\""+tagItem['name'].replace(':','')+"\" align=\"middle\" class=\"emoji\"/>"
+        content=content.replace(tagItem['name'],emojiHtml)
+    return content
+
 def individualPostAsHtml(baseDir: str, \
                          session,wfRequest: {},personCache: {}, \
                          nickname: str,domain: str,port: int, \
@@ -1158,6 +1176,9 @@ def individualPostAsHtml(baseDir: str, \
         contentStr+=postJsonObject['object']['content']+attachmentStr
         contentStr+='</div>'
 
+    if postJsonObject['object'].get('tag'):
+        contentStr=htmlRemplaceEmojiFromTags(contentStr,postJsonObject['object']['tag'])
+
     return \
         '<div class="'+containerClass+'">\n'+ \
         avatarDropdown+ \