diff --git a/lib/proposals_discussion_plugin/topic_helper.rb b/lib/proposals_discussion_plugin/topic_helper.rb
index 259b378..2a2bf1d 100644
--- a/lib/proposals_discussion_plugin/topic_helper.rb
+++ b/lib/proposals_discussion_plugin/topic_helper.rb
@@ -5,8 +5,8 @@ module ProposalsDiscussionPlugin::TopicHelper
     image_icon = topic.image ?  image_tag(topic.image.public_filename(:thumb), :class => 'disable-zoom') : ''
 
     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(:div, '', :class=>'topic-color', :style => "background-color: #{topic.color};".html_safe) +
+        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/discussion.html.erb b/views/content_viewer/discussion.html.erb
index 336c75f..b55efd4 100644
--- a/views/content_viewer/discussion.html.erb
+++ b/views/content_viewer/discussion.html.erb
@@ -2,7 +2,7 @@
 <%= javascript_include_tag 'plugins/proposals_discussion/proposals_list.js' %>
 
 <div class="description">
-  <%= discussion.body %>
+  <%= (discussion.body||'').html_safe %>
 </div>
 
 <div class="phases">
diff --git a/views/content_viewer/discussion_topics.html.erb b/views/content_viewer/discussion_topics.html.erb
index e7b958a..571c61a 100644
--- a/views/content_viewer/discussion_topics.html.erb
+++ b/views/content_viewer/discussion_topics.html.erb
@@ -2,7 +2,7 @@
 <%= javascript_include_tag 'plugins/proposals_discussion/proposals_list.js' %>
 
 <div class="description">
-  <%= discussion.body %>
+  <%= (discussion.body||'').html_safe %>
 </div>
 
 <% if discussion.allow_create?(user) %>
diff --git a/views/content_viewer/topic.html.erb b/views/content_viewer/topic.html.erb
index 8cd0a9c..ddb9dea 100644
--- a/views/content_viewer/topic.html.erb
+++ b/views/content_viewer/topic.html.erb
@@ -10,7 +10,7 @@
 <div class="topic-content">
 
 <div class="description">
-  <%= topic.body %>
+  <%= (topic.body||'').html_safe %>
 </div>
 
 <% unless list_view %>
--
libgit2 0.21.2