diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index fc0b882..0b33cdb 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -1,6 +1,8 @@
 module EventsHelper
 
   include DatesHelper
+  include ActionView::Helpers::OutputSafetyHelper
+
   def list_events(date, events)
     title = _('Events for %s') % show_date_month(date)
     user_events = events.select { |item| item.display_to?(user) }
diff --git a/app/models/blog_archives_block.rb b/app/models/blog_archives_block.rb
index 89bab8d..11448b7 100644
--- a/app/models/blog_archives_block.rb
+++ b/app/models/blog_archives_block.rb
@@ -40,9 +40,8 @@ class BlogArchivesBlock < Block
       end
       results << "</ul>"
     end
-    results.html_safe
     block_title(title) +
-    content_tag('ul', results, :class => 'blog-archives') +
+    content_tag('ul', results.html_safe, :class => 'blog-archives') +
     content_tag('div', link_to(_('Subscribe RSS Feed'), owner_blog.feed.url), :class => 'subscribe-feed')
   end
 
diff --git a/test/unit/recent_documents_block_test.rb b/test/unit/recent_documents_block_test.rb
index 5835c63..c1275de 100644
--- a/test/unit/recent_documents_block_test.rb
+++ b/test/unit/recent_documents_block_test.rb
@@ -2,6 +2,8 @@ require_relative "../test_helper"
 
 class RecentDocumentsBlockTest < ActiveSupport::TestCase
 
+  include ActionView::Helpers::OutputSafetyHelper
+
   def setup
     @articles = []
     @profile = create_user('testinguser').person
--
libgit2 0.21.2