diff --git a/content.py b/content.py
index b8353cee9..f824d5755 100644
--- a/content.py
+++ b/content.py
@@ -150,6 +150,15 @@ def addHtmlTags(baseDir: str,httpPrefix: str, \
     if content.startswith('<p>'):
         return content
     words=content.replace(',',' ').replace(';',' ')
+    # remove . for words which are not mentions
+    wordCtr=0
+    for wordIndex in range(0,len(words)-1):
+        wordStr=words[wordIndex]
+        if wordStr.endswith('.'):
+            if not wordStr.startswith('@'):
+                words[wordIndex]=words[wordIndex][:-1]
+        if wordStr.startsswith('.'):
+            words[wordIndex]=words[wordIndex][1:]
     replaceMentions={}
     replaceHashTags={}
     replaceEmoji={}