diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 878c0811..75eadec6 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -280,7 +280,7 @@ EOL
     else
       real_page = WikiReference.page_that_redirects_for(@web, @page_name)
         if real_page
-          flash[:info] = "Redirected from \"#{@page_name}\".".html_safe
+          flash[:info] = "Redirected from \"#{@page_name}\"."
           redirect_to :web => @web_name, :action => 'published', :id => real_page, :status => 301
         else
           render(:text => "Page '#{@page_name}' not found", :status => 404, :layout => 'error')
@@ -366,11 +366,11 @@ EOL
       if not @page_name.nil? and not @page_name.empty?
         real_page = WikiReference.page_that_redirects_for(@web, @page_name)
         if real_page
-          flash[:info] = "Redirected from \"#{@page_name}\".".html_safe
+          flash[:info] = "Redirected from \"#{@page_name}\"."
           redirect_to :web => @web_name, :action => 'show', :id => real_page, :status => 301
         else
           flash[:info] = "Page \"#{@page_name}\" does not exist.\n" +
-                         "Please create it now, or hit the \"back\" button in your browser.".html_safe
+                         "Please create it now, or hit the \"back\" button in your browser."
           redirect_to :web => @web_name, :action => 'new', :id => @page_name
         end
       else
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index c05e0292..1c84ed1d 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -78,11 +78,11 @@
 <%= render(:file => 'navigation') unless @web.nil? || @hide_navigation %>
 
 <%- if flash[:info] -%>
-  <div class="info"><%= escape_preserving_linefeeds flash[:info] %></div>
+  <div class="info"><%= escape_preserving_linefeeds flash[:info].html_safe %></div>
 <%- end -%>
 
 <%- if @error or flash[:error] -%> 
-    <div class="errorExplanation"><%= escape_preserving_linefeeds(@error || flash[:error]) %></div>
+    <div class="errorExplanation"><%= escape_preserving_linefeeds(@error || flash[:error].html_safe) %></div>
 <%- end -%>
 
 <%= @content_for_layout %>