diff --git a/plugins/Comet/CometPlugin.php b/plugins/Comet/CometPlugin.php
index cff0d4c9d6..2e0bb40a46 100644
--- a/plugins/Comet/CometPlugin.php
+++ b/plugins/Comet/CometPlugin.php
@@ -143,6 +143,7 @@ class CometPlugin extends Plugin
 
         $arr = $act->twitter_status_array($notice, true);
         $arr['url'] = $notice->bestUrl();
+        $arr['html'] = htmlspecialchars($notice->rendered);
 
         $profile = $notice->getProfile();
         $arr['user']['profile_url'] = $profile->profileurl;
diff --git a/plugins/Comet/updatetimeline.js b/plugins/Comet/updatetimeline.js
index c6eefb4475..55511d35ff 100644
--- a/plugins/Comet/updatetimeline.js
+++ b/plugins/Comet/updatetimeline.js
@@ -34,6 +34,8 @@ var updater = function()
      function makeNoticeItem(data)
      {
           user = data['user'];
+          html = data['html'].replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>');
+
           ni = "<li class=\"hentry notice\" id=\"notice-"+data['id']+"\">"+
                "<div class=\"entry-title\">"+
                "<span class=\"vcard author\">"+
@@ -42,7 +44,7 @@ var updater = function()
                "<span class=\"nickname fn\">"+user['screen_name']+"</span>"+
                "</a>"+
                "</span>"+
-               "<p class=\"entry-content\">"+data['text']+"</p>"+
+               "<p class=\"entry-content\">"+html+"</p>"+
                "</div>"+
                "<div class=\"entry-content\">"+
                "<dl class=\"timestamp\">"+