diff --git a/lib/proposals_discussion_plugin/topic_helper.rb b/lib/proposals_discussion_plugin/topic_helper.rb
index 259b378..90b7022 100644
--- a/lib/proposals_discussion_plugin/topic_helper.rb
+++ b/lib/proposals_discussion_plugin/topic_helper.rb
@@ -6,7 +6,7 @@ module ProposalsDiscussionPlugin::TopicHelper
 
     content_tag(:div, (
       content_tag(:div, '', :class=>'topic-color', :style => "background-color: #{topic.color};") +
-        content_tag(:h2, link_to(image_icon + content_tag(:span, topic.title), topic.view_url))
+        content_tag(:h2, link_to(image_icon + content_tag(:span, topic.title).html_safe, topic.view_url))
     ), :class => 'topic-title')
   end
 
diff --git a/views/content_viewer/proposal.html.erb b/views/content_viewer/proposal.html.erb
index 05aec92..dfa7faa 100644
--- a/views/content_viewer/proposal.html.erb
+++ b/views/content_viewer/proposal.html.erb
@@ -1,7 +1,7 @@
 <span class="created-at">
   <span class="date"><%= show_date(proposal.published_at) %></span>
-  <span class="author"><%= _(", by %s") % (proposal.author ? link_to(proposal.author_name, proposal.author_url) : proposal.author_name) %></span>
-  <span class="comments"><%= _(" - %s") % link_to_comments(proposal) %></span>
+  <span class="author"><%= _(", by %s") % (proposal.author ? link_to(proposal.author_name, proposal.author_url).html_safe : proposal.author_name) %></span>
+  <span class="comments"><%= _(" - %s") % link_to_comments(proposal).html_safe %></span>
 </span>
 
 <div class="discussion">
@@ -17,7 +17,7 @@
 </div>
 
 <div class="body">
-  <div class="content"><%= proposal.body %></div>
+  <div class="content"><%= proposal.body.html_safe %></div>
 </div>
 
 <% if proposal.created_by == user && !proposal.published %>
--
libgit2 0.21.2