diff --git a/app/views/notes/_show.html.haml b/app/views/notes/_show.html.haml
index ee9f9ffaa4b..1907e9cc0af 100644
--- a/app/views/notes/_show.html.haml
+++ b/app/views/notes/_show.html.haml
@@ -2,7 +2,7 @@
   %div.note_author
     = image_tag gravatar_icon(note.author.email), :class => "left", :width => 40, :style => "padding-right:5px;"
   %div.note_content.left
-    = simple_format(html_escape(note.note))
+    = raw RDiscount.new(note.note, :smart, :filter_html).to_html
     - if note.attachment.url
       Attachment:
       = link_to note.attachment_identifier, note.attachment.url, :target => "_blank"