diff --git a/src/formatters.nim b/src/formatters.nim
index 45a944d..a004e82 100644
--- a/src/formatters.nim
+++ b/src/formatters.nim
@@ -49,6 +49,8 @@ proc linkifyText*(text: string): string =
   result = result.replace(usernameRegex, reUsernameToLink)
   result = result.replace(emailRegex, reEmailToLink)
   result = result.replace(urlRegex, reUrlToLink)
+  result = result.replace(re"</a>\s+", "</a> ")
+  result = result.replace(re"</a> ([.,\)])", "</a>$1")
 
 proc stripTwitterUrls*(text: string): string =
   result = text