diff --git a/zephyr/models.py b/zephyr/models.py
index 5ce737b276..0b379f072d 100644
--- a/zephyr/models.py
+++ b/zephyr/models.py
@@ -457,8 +457,10 @@ class Message(models.Model):
             gravatar_hash     = gravatar_hash(self.sender.user.email))
 
         if apply_markdown:
-#            obj['content'] = bugdown.convert(self.content)
-            obj['content'] = linebreak(escape(self.content))
+            if self.sending_client.name in ('API', 'github_bot'):
+                obj['content'] = bugdown.convert(self.content)
+            else:
+                obj['content'] = linebreak(escape(self.content))
             obj['content_type'] = 'text/html'
         else:
             obj['content'] = self.content