diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb
index c6fd357c7..0a996a052 100644
--- a/app/views/activities/index.html.erb
+++ b/app/views/activities/index.html.erb
@@ -9,7 +9,7 @@
   <dt class="<%= e.event_type %> <%= "grouped" if in_group %> <%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>">
   <%= avatar(e.event_author, :size => "24") if e.respond_to?(:event_author) %>
   <span class="time"><%= format_time(e.event_datetime, false) %></span>
-  <%= content_tag('span', h(e.project), :class => 'project') if @project.nil? || @project != e.project %>
+  <%= content_tag('span', e.project, :class => 'project') if @project.nil? || @project != e.project %>
   <%= link_to format_activity_title(e.event_title), e.event_url %>
   </dt>
   <dd class="<%= "grouped" if in_group %>"><span class="description"><%= format_activity_description(e.event_description) %></span>
diff --git a/app/views/admin/plugins.html.erb b/app/views/admin/plugins.html.erb
index 117735cdc..47c1dfade 100644
--- a/app/views/admin/plugins.html.erb
+++ b/app/views/admin/plugins.html.erb
@@ -4,11 +4,11 @@
 <table class="list plugins">
     <% @plugins.each do |plugin| %>
         <tr id="plugin-<%= plugin.id %>" class="<%= cycle('odd', 'even') %>">
-        <td class="name"><span class="name"><%=h plugin.name %></span>
-            <%= content_tag('span', h(plugin.description), :class => 'description') unless plugin.description.blank? %>
-            <%= content_tag('span', link_to(h(plugin.url), plugin.url), :class => 'url') unless plugin.url.blank? %>
+        <td class="name"><span class="name"><%= plugin.name %></span>
+            <%= content_tag('span', plugin.description, :class => 'description') unless plugin.description.blank? %>
+            <%= content_tag('span', link_to(plugin.url, plugin.url), :class => 'url') unless plugin.url.blank? %>
         </td>
-        <td class="author"><%= plugin.author_url.blank? ? h(plugin.author) : link_to(h(plugin.author), plugin.author_url) %></td>
+        <td class="author"><%= plugin.author_url.blank? ? plugin.author : link_to(plugin.author, plugin.author_url) %></td>
         <td class="version"><span class="icon"><%= plugin.version %></span></td>
         <td class="configure"><%= link_to(l(:button_configure), plugin_settings_path(plugin)) if plugin.configurable? %></td>
         </tr>
diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb
index 001a038db..0804b8002 100644
--- a/app/views/attachments/_links.html.erb
+++ b/app/views/attachments/_links.html.erb
@@ -11,7 +11,7 @@
                 :controller => 'attachments', :action => 'show',
                 :id => attachment, :filename => attachment.filename %>
   <% end %>
-  <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
+  <%= " - #{attachment.description}" unless attachment.description.blank? %>
   <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
   <% if options[:deletable] %>
     <%= link_to image_tag('delete.png'), attachment_path(attachment),
@@ -21,7 +21,7 @@
                                          :title => l(:button_delete) %>
   <% end %>
   <% if options[:author] %>
-    <span class="author"><%= h(attachment.author) %>, <%= format_time(attachment.created_on) %></span>
+    <span class="author"><%= attachment.author %>, <%= format_time(attachment.created_on) %></span>
   <% end %>
   </p>
 <% end %>
diff --git a/app/views/attachments/diff.html.erb b/app/views/attachments/diff.html.erb
index b8fb69048..d125f82fd 100644
--- a/app/views/attachments/diff.html.erb
+++ b/app/views/attachments/diff.html.erb
@@ -1,7 +1,7 @@
 <h2><%=h @attachment.filename %></h2>
 
 <div class="attachments">
-<p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
+<p><%= "#{@attachment.description} - " unless @attachment.description.blank? %>
    <span class="author"><%= link_to_user(@attachment.author) %>, <%= format_time(@attachment.created_on) %></span></p>
 <p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
    <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span></p>
diff --git a/app/views/attachments/edit.html.erb b/app/views/attachments/edit.html.erb
index c979c90ea..de089eae5 100644
--- a/app/views/attachments/edit.html.erb
+++ b/app/views/attachments/edit.html.erb
@@ -11,7 +11,7 @@
       <td colspan="2">
         <span class="icon icon-attachment"><%= attachment.filename_was %></span>
         <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
-        <span class="author"><%= h(attachment.author) %>, <%= format_time(attachment.created_on) %></span>
+        <span class="author"><%= attachment.author %>, <%= format_time(attachment.created_on) %></span>
       </td>
     </tr>
     <tr id="attachment-<%= attachment.id %>">
diff --git a/app/views/attachments/file.html.erb b/app/views/attachments/file.html.erb
index 47cb7b1f9..e507ab648 100644
--- a/app/views/attachments/file.html.erb
+++ b/app/views/attachments/file.html.erb
@@ -1,7 +1,7 @@
 <h2><%=h @attachment.filename %></h2>
 
 <div class="attachments">
-<p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
+<p><%= "#{@attachment.description} - " unless @attachment.description.blank? %>
    <span class="author"><%= link_to_user(@attachment.author) %>, <%= format_time(@attachment.created_on) %></span></p>
 <p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
    <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span></p>
diff --git a/app/views/auth_sources/index.html.erb b/app/views/auth_sources/index.html.erb
index ad84572d4..fcdbf7d43 100644
--- a/app/views/auth_sources/index.html.erb
+++ b/app/views/auth_sources/index.html.erb
@@ -15,10 +15,10 @@
   <tbody>
 <% for source in @auth_sources %>
   <tr id="auth-source-<%= source.id %>" class="<%= cycle("odd", "even") %>">
-    <td class="name"><%= link_to(h(source.name), :action => 'edit', :id => source)%></td>
-    <td><%= h source.auth_method_name %></td>
-    <td><%= h source.host %></td>
-    <td><%= h source.users.count %></td>
+    <td class="name"><%= link_to(source.name, :action => 'edit', :id => source)%></td>
+    <td><%= source.auth_method_name %></td>
+    <td><%= source.host %></td>
+    <td><%= source.users.count %></td>
     <td class="buttons">
       <%= link_to l(:button_test), try_connection_auth_source_path(source), :class => 'icon icon-test' %>
       <%= delete_link auth_source_path(source) %>
diff --git a/app/views/boards/index.html.erb b/app/views/boards/index.html.erb
index 640b8a1a3..29074130b 100644
--- a/app/views/boards/index.html.erb
+++ b/app/views/boards/index.html.erb
@@ -11,7 +11,7 @@
 <% Board.board_tree(@boards) do |board, level| %>
   <tr class="<%= cycle 'odd', 'even' %>">
     <td class="name" style="padding-left: <%= level * 18 %>px;">
-      <%= link_to h(board.name), project_board_path(board.project, board), :class => "board" %><br />
+      <%= link_to board.name, project_board_path(board.project, board), :class => "board" %><br />
       <%=h board.description %>
     </td>
     <td class="topic-count"><%= board.topics_count %></td>
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index f5e9b1295..7a599eae2 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -10,7 +10,7 @@
 
 <div id="add-message" style="display:none;">
 <% if User.current.allowed_to?(:add_messages, @board.project) %>
-<h2><%= link_to h(@board.name), project_board_path(@project, @board) %> &#187; <%= l(:label_message_new) %></h2>
+<h2><%= link_to @board.name, project_board_path(@project, @board) %> &#187; <%= l(:label_message_new) %></h2>
 <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %>
   <%= render :partial => 'messages/form', :locals => {:f => f} %>
   <p><%= submit_tag l(:button_create) %>
@@ -21,8 +21,8 @@
 <% end %>
 </div>
 
-<h2><%=h @board.name %></h2>
-<p class="subtitle"><%=h @board.description %></p>
+<h2><%= @board.name %></h2>
+<p class="subtitle"><%= @board.description %></p>
 
 <% if @topics.any? %>
 <table class="list messages">
@@ -36,7 +36,7 @@
   <tbody>
   <% @topics.each do |topic| %>
     <tr class="message <%= cycle 'odd', 'even' %> <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>">
-      <td class="subject"><%= link_to h(topic.subject), board_message_path(@board, topic) %></td>
+      <td class="subject"><%= link_to topic.subject, board_message_path(@board, topic) %></td>
       <td class="author"><%= link_to_user(topic.author) %></td>
       <td class="created_on"><%= format_time(topic.created_on) %></td>
       <td class="reply-count"><%= topic.replies_count %></td>
diff --git a/app/views/calendars/show.html.erb b/app/views/calendars/show.html.erb
index bfa8351d6..f18946027 100644
--- a/app/views/calendars/show.html.erb
+++ b/app/views/calendars/show.html.erb
@@ -1,4 +1,4 @@
-<h2><%= @query.new_record? ? l(:label_calendar) : h(@query.name) %></h2>
+<h2><%= @query.new_record? ? l(:label_calendar) : @query.name %></h2>
 
 <%= form_tag({:controller => 'calendars', :action => 'show', :project_id => @project},
              :method => :get, :id => 'query_form') do %>
diff --git a/app/views/common/_calendar.html.erb b/app/views/common/_calendar.html.erb
index 7951b68ce..d950749aa 100644
--- a/app/views/common/_calendar.html.erb
+++ b/app/views/common/_calendar.html.erb
@@ -12,13 +12,13 @@ while day <= calendar.enddt %>
 <% calendar.events_on(day).each do |i| %>
   <% if i.is_a? Issue %>
   <div class="<%= i.css_classes %> <%= 'starting' if day == i.start_date %> <%= 'ending' if day == i.due_date %> tooltip">
-  <%= h("#{i.project} -") unless @project && @project == i.project %>
+  <%= "#{i.project} -" unless @project && @project == i.project %>
   <%= link_to_issue i, :truncate => 30 %>
   <span class="tip"><%= render_issue_tooltip i %></span>
   </div>
   <% else %>
   <span class="icon icon-package">
-    <%= h("#{i.project} -") unless @project && @project == i.project %>
+    <%= "#{i.project} -" unless @project && @project == i.project %>
     <%= link_to_version i%>
   </span>
   <% end %>
diff --git a/app/views/common/error.html.erb b/app/views/common/error.html.erb
index 5bb43dea0..a5ec39c3a 100644
--- a/app/views/common/error.html.erb
+++ b/app/views/common/error.html.erb
@@ -1,7 +1,7 @@
-<h2><%=h @status %></h2>
+<h2><%= @status %></h2>
 
 <% if @message.present? %>
-  <p id="errorExplanation"><%=h @message %></p>
+  <p id="errorExplanation"><%= @message %></p>
 <% end %>
 <p><a href="javascript:history.back()"><%= l(:button_back) %></a></p>
 
diff --git a/app/views/context_menus/issues.html.erb b/app/views/context_menus/issues.html.erb
index 65ddb002b..48be73b02 100644
--- a/app/views/context_menus/issues.html.erb
+++ b/app/views/context_menus/issues.html.erb
@@ -14,7 +14,7 @@
     <a href="#" class="submenu"><%= l(:field_status) %></a>
     <ul>
     <% @allowed_statuses.each do |s| -%>
-        <li><%= context_menu_link h(s.name), bulk_update_issues_path(:ids => @issue_ids, :issue => {:status_id => s}, :back_url => @back), :method => :post,
+        <li><%= context_menu_link s.name, bulk_update_issues_path(:ids => @issue_ids, :issue => {:status_id => s}, :back_url => @back), :method => :post,
                                   :selected => (@issue && s == @issue.status), :disabled => !@can[:edit] %></li>
     <% end -%>
     </ul>
@@ -26,7 +26,7 @@
     <a href="#" class="submenu"><%= l(:field_tracker) %></a>
     <ul>
     <% @trackers.each do |t| -%>
-        <li><%= context_menu_link h(t.name), bulk_update_issues_path(:ids => @issue_ids, :issue => {'tracker_id' => t}, :back_url => @back), :method => :post,
+        <li><%= context_menu_link t.name, bulk_update_issues_path(:ids => @issue_ids, :issue => {'tracker_id' => t}, :back_url => @back), :method => :post,
                                   :selected => (@issue && t == @issue.tracker), :disabled => !@can[:edit] %></li>
     <% end -%>
     </ul>
@@ -38,7 +38,7 @@
     <a href="#" class="submenu"><%= l(:field_priority) %></a>
     <ul>
     <% @priorities.each do |p| -%>
-        <li><%= context_menu_link h(p.name), bulk_update_issues_path(:ids => @issue_ids, :issue => {'priority_id' => p}, :back_url => @back), :method => :post,
+        <li><%= context_menu_link p.name, bulk_update_issues_path(:ids => @issue_ids, :issue => {'priority_id' => p}, :back_url => @back), :method => :post,
                                   :selected => (@issue && p == @issue.priority), :disabled => (!@can[:edit] || @issues.detect {|i| !i.leaf?}) %></li>
     <% end -%>
     </ul>
@@ -68,7 +68,7 @@
                                   :disabled => !@can[:edit] %></li>
     <% end %>
     <% @assignables.each do |u| -%>
-        <li><%= context_menu_link h(u.name), bulk_update_issues_path(:ids => @issue_ids, :issue => {'assigned_to_id' => u}, :back_url => @back), :method => :post,
+        <li><%= context_menu_link u.name, bulk_update_issues_path(:ids => @issue_ids, :issue => {'assigned_to_id' => u}, :back_url => @back), :method => :post,
                                   :selected => (@issue && u == @issue.assigned_to), :disabled => !@can[:edit] %></li>
     <% end -%>
         <li><%= context_menu_link l(:label_nobody), bulk_update_issues_path(:ids => @issue_ids, :issue => {'assigned_to_id' => 'none'}, :back_url => @back), :method => :post,
@@ -82,7 +82,7 @@
     <a href="#" class="submenu"><%= l(:field_category) %></a>
     <ul>
     <% @project.issue_categories.each do |u| -%>
-        <li><%= context_menu_link h(u.name), bulk_update_issues_path(:ids => @issue_ids, :issue => {'category_id' => u}, :back_url => @back), :method => :post,
+        <li><%= context_menu_link u.name, bulk_update_issues_path(:ids => @issue_ids, :issue => {'category_id' => u}, :back_url => @back), :method => :post,
                                   :selected => (@issue && u == @issue.category), :disabled => !@can[:edit] %></li>
     <% end -%>
         <li><%= context_menu_link l(:label_none), bulk_update_issues_path(:ids => @issue_ids, :issue => {'category_id' => 'none'}, :back_url => @back), :method => :post,
@@ -105,7 +105,7 @@
 
   <% @options_by_custom_field.each do |field, options| %>
     <li class="folder cf_<%= field.id %>">
-      <a href="#" class="submenu"><%= h(field.name) %></a>
+      <a href="#" class="submenu"><%= field.name %></a>
       <ul>
       <% options.each do |text, value| %>
         <li><%= bulk_update_custom_field_context_menu_link(field, text, value || text) %></li>
diff --git a/app/views/context_menus/time_entries.html.erb b/app/views/context_menus/time_entries.html.erb
index 3ab8d07aa..5f6ebd7ef 100644
--- a/app/views/context_menus/time_entries.html.erb
+++ b/app/views/context_menus/time_entries.html.erb
@@ -14,7 +14,7 @@
     <a href="#" class="submenu"><%= l(:field_activity) %></a>
     <ul>
     <% @activities.each do |u| -%>
-        <li><%= context_menu_link h(u.name), {:controller => 'timelog', :action => 'bulk_update', :ids => @time_entries.collect(&:id), :time_entry => {'activity_id' => u}, :back_url => @back}, :method => :post,
+        <li><%= context_menu_link u.name, {:controller => 'timelog', :action => 'bulk_update', :ids => @time_entries.collect(&:id), :time_entry => {'activity_id' => u}, :back_url => @back}, :method => :post,
                                   :selected => (@time_entry && u == @time_entry.activity), :disabled => !@can[:edit] %></li>
     <% end -%>
         <li><%= context_menu_link l(:label_none), {:controller => 'timelog', :action => 'bulk_update', :ids => @time_entries.collect(&:id), :time_entry => {'activity_id' => 'none'}, :back_url => @back}, :method => :post,
@@ -25,7 +25,7 @@
 
   <% @options_by_custom_field.each do |field, options| %>
     <li class="folder cf_<%= field.id %>">
-      <a href="#" class="submenu"><%= h(field.name) %></a>
+      <a href="#" class="submenu"><%= field.name %></a>
       <ul>
       <% options.each do |text, value| %>
         <li><%= bulk_update_time_entry_custom_field_context_menu_link(field, text, value || text) %></li>
diff --git a/app/views/custom_fields/_form.html.erb b/app/views/custom_fields/_form.html.erb
index 0e1851d01..c5e2824c5 100644
--- a/app/views/custom_fields/_form.html.erb
+++ b/app/views/custom_fields/_form.html.erb
@@ -94,7 +94,7 @@ when "IssueCustomField" %>
                       (@custom_field.trackers.include? tracker),
                       :id => "custom_field_tracker_ids_#{tracker.id}" %>
     <label class="no-css" for="custom_field_tracker_ids_<%=tracker.id%>">
-      <%= h(tracker.name) %>
+      <%= tracker.name %>
     </label>
   <% end %>
   <%= hidden_field_tag "custom_field[tracker_ids][]", '' %>
@@ -103,7 +103,7 @@ when "IssueCustomField" %>
 
   <fieldset class="box" id="custom_field_project_ids"><legend><%= l(:label_project_plural) %></legend>
     <%= render_project_nested_lists(Project.all) do |p|
-      content_tag('label', check_box_tag('custom_field[project_ids][]', p.id, @custom_field.projects.to_a.include?(p), :id => nil) + ' ' + h(p))
+      content_tag('label', check_box_tag('custom_field[project_ids][]', p.id, @custom_field.projects.to_a.include?(p), :id => nil) + ' ' + p)
     end %>
     <%= hidden_field_tag('custom_field[project_ids][]', '', :id => nil) %>
     <p><%= check_all_links 'custom_field_project_ids' %></p>
diff --git a/app/views/custom_fields/_index.html.erb b/app/views/custom_fields/_index.html.erb
index 0b578d6ee..858665e93 100644
--- a/app/views/custom_fields/_index.html.erb
+++ b/app/views/custom_fields/_index.html.erb
@@ -13,7 +13,7 @@
   <tbody>
   <% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%>
     <tr class="<%= cycle("odd", "even") %>">
-      <td class="name"><%= link_to h(custom_field.name), edit_custom_field_path(custom_field) %></td>
+      <td class="name"><%= link_to custom_field.name, edit_custom_field_path(custom_field) %></td>
       <td><%= l(custom_field.format.label) %></td>
       <td><%= checked_image custom_field.is_required? %></td>
       <% if tab[:name] == 'IssueCustomField' %>
diff --git a/app/views/documents/_document.html.erb b/app/views/documents/_document.html.erb
index e14d880a7..9a96d5d32 100644
--- a/app/views/documents/_document.html.erb
+++ b/app/views/documents/_document.html.erb
@@ -1,4 +1,4 @@
-<h4><%= link_to h(document.title), document_path(document) %></h4>
+<h4><%= link_to document.title, document_path(document) %></h4>
 <p><em><%= format_time(document.updated_on) %></em></p>
 
 <div class="wiki">
diff --git a/app/views/documents/show.html.erb b/app/views/documents/show.html.erb
index 8b1f0067b..8d2e495c0 100644
--- a/app/views/documents/show.html.erb
+++ b/app/views/documents/show.html.erb
@@ -7,9 +7,9 @@
 <% end %>
 </div>
 
-<h2><%=h @document.title %></h2>
+<h2><%= @document.title %></h2>
 
-<p><em><%=h @document.category.name %><br />
+<p><em><%= @document.category.name %><br />
 <%= format_date @document.created_on %></em></p>
 
 <% if @document.custom_field_values.any? %>
diff --git a/app/views/enumerations/index.html.erb b/app/views/enumerations/index.html.erb
index 684b933a6..d1fb91926 100644
--- a/app/views/enumerations/index.html.erb
+++ b/app/views/enumerations/index.html.erb
@@ -15,7 +15,7 @@
 </tr></thead>
 <% enumerations.each do |enumeration| %>
 <tr class="<%= cycle('odd', 'even') %>">
-    <td class="name"><%= link_to h(enumeration), edit_enumeration_path(enumeration) %></td>
+    <td class="name"><%= link_to enumeration, edit_enumeration_path(enumeration) %></td>
     <td class="tick"><%= checked_image enumeration.is_default? %></td>
     <td class="tick"><%= checked_image enumeration.active? %></td>
     <td class="reorder"><%= reorder_links('enumeration', {:action => 'update', :id => enumeration}, :put) %></td>
diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb
index c164cc011..decc7314e 100644
--- a/app/views/files/index.html.erb
+++ b/app/views/files/index.html.erb
@@ -21,7 +21,7 @@
   <% if container.is_a?(Version) -%>
   <tr>
     <th colspan="6">
-      <%= link_to(h(container), {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package") %>
+      <%= link_to(container, {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package") %>
     </th>
   </tr>
   <% end -%>
diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb
index 5dd95232d..ada60cd66 100644
--- a/app/views/gantts/show.html.erb
+++ b/app/views/gantts/show.html.erb
@@ -6,7 +6,7 @@
 <% end %>
 </div>
 
-<h2><%= @query.new_record? ? l(:label_gantt) : h(@query.name) %></h2>
+<h2><%= @query.new_record? ? l(:label_gantt) : @query.name %></h2>
 
 <%= form_tag({:controller => 'gantts', :action => 'show',
              :project_id => @project, :month => params[:month],
@@ -172,7 +172,7 @@
     style += "height: #{height}px;"
   %>
   <%= content_tag(:div, :style => style, :class => "gantt_hdr") do %>
-    <%= link_to h("#{month_f.year}-#{month_f.month}"),
+    <%= link_to "#{month_f.year}-#{month_f.month}",
                 @gantt.params.merge(:year => month_f.year, :month => month_f.month),
                 :title => "#{month_name(month_f.month)} #{month_f.year}" %>
   <% end %>
diff --git a/app/views/groups/index.html.erb b/app/views/groups/index.html.erb
index a600ca48d..888b4085d 100644
--- a/app/views/groups/index.html.erb
+++ b/app/views/groups/index.html.erb
@@ -13,7 +13,7 @@
   <tbody>
 <% @groups.each do |group| %>
   <tr id="group-<%= group.id %>" class="<%= cycle 'odd', 'even' %> <%= "builtin" if group.builtin? %>">
-    <td class="name"><%= link_to h(group), edit_group_path(group) %></td>
+    <td class="name"><%= link_to group, edit_group_path(group) %></td>
     <td class="user_count"><%= (@user_count_by_group_id[group.id] || 0) unless group.builtin? %></td>
     <td class="buttons"><%= delete_link group unless group.builtin? %></td>
   </tr>
diff --git a/app/views/groups/show.html.erb b/app/views/groups/show.html.erb
index 4a0a18da7..b10427bf9 100644
--- a/app/views/groups/show.html.erb
+++ b/app/views/groups/show.html.erb
@@ -2,6 +2,6 @@
 
 <ul>
 <% @group.users.each do |user| %>
-    <li><%=h user %></li>
+    <li><%= user %></li>
 <% end %>
 </ul>
diff --git a/app/views/issue_statuses/index.html.erb b/app/views/issue_statuses/index.html.erb
index 81c34f703..3da8c5b80 100644
--- a/app/views/issue_statuses/index.html.erb
+++ b/app/views/issue_statuses/index.html.erb
@@ -18,9 +18,9 @@
   <tbody>
 <% for status in @issue_statuses %>
   <tr class="<%= cycle("odd", "even") %>">
-  <td class="name"><%= link_to h(status.name), edit_issue_status_path(status) %></td>
+  <td class="name"><%= link_to status.name, edit_issue_status_path(status) %></td>
   <% if Issue.use_status_for_done_ratio? %>
-  <td><%= h status.default_done_ratio %></td>
+  <td><%= status.default_done_ratio %></td>
   <% end %>
   <td><%= checked_image status.is_closed? %></td>
   <td class="reorder"><%= reorder_links('issue_status', {:action => 'update', :id => status, :page => params[:page]}, :put) %></td>
diff --git a/app/views/issues/_relations.html.erb b/app/views/issues/_relations.html.erb
index fcb1759ef..d3e7f4d0b 100644
--- a/app/views/issues/_relations.html.erb
+++ b/app/views/issues/_relations.html.erb
@@ -16,7 +16,7 @@
   <td class="subject" style="width: 50%">
     <%= relation.to_s(@issue) {|other| link_to_issue(other, :project => Setting.cross_project_issue_relations?)}.html_safe %>
   </td>
-  <td class="status"><%=h other_issue.status.name %></td>
+  <td class="status"><%= other_issue.status.name %></td>
   <td class="start_date"><%= format_date(other_issue.start_date) %></td>
   <td class="due_date"><%= format_date(other_issue.due_date) %></td>
   <td class="buttons"><%= link_to image_tag('link_break.png'),
diff --git a/app/views/issues/bulk_edit.html.erb b/app/views/issues/bulk_edit.html.erb
index 4cdc257da..b4ec3d542 100644
--- a/app/views/issues/bulk_edit.html.erb
+++ b/app/views/issues/bulk_edit.html.erb
@@ -93,7 +93,7 @@
 
 <% @custom_fields.each do |custom_field| %>
   <p>
-    <label><%= h(custom_field.name) %></label>
+    <label><%= custom_field.name %></label>
     <%= custom_field_tag_for_bulk_edit('issue', custom_field, @issues, @issue_params[:custom_field_values][custom_field.id.to_s]) %>
   </p>
 <% end %>
diff --git a/app/views/issues/edit.html.erb b/app/views/issues/edit.html.erb
index f2c6024ba..1cd61b783 100644
--- a/app/views/issues/edit.html.erb
+++ b/app/views/issues/edit.html.erb
@@ -1,4 +1,4 @@
-<h2><%=h "#{@issue.tracker.name} ##{@issue.id}" %></h2>
+<h2><%= "#{@issue.tracker.name} ##{@issue.id}" %></h2>
 
 <%= render :partial => 'edit' %>
 <% content_for :header_tags do %>
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 50c8bf9bf..55bfc5647 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -5,7 +5,7 @@
 <% end %>
 </div>
 
-<h2><%= @query.new_record? ? l(:label_issue_plural) : h(@query.name) %></h2>
+<h2><%= @query.new_record? ? l(:label_issue_plural) : @query.name %></h2>
 <% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
 
 <%= form_tag({ :controller => 'issues', :action => 'index', :project_id => @project },
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 6a514ac88..ad8ee98a4 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -35,14 +35,14 @@
 
 <table class="attributes">
 <%= issue_fields_rows do |rows|
-  rows.left l(:field_status), h(@issue.status.name), :class => 'status'
-  rows.left l(:field_priority), h(@issue.priority.name), :class => 'priority'
+  rows.left l(:field_status), @issue.status.name, :class => 'status'
+  rows.left l(:field_priority), @issue.priority.name, :class => 'priority'
 
   unless @issue.disabled_core_fields.include?('assigned_to_id')
     rows.left l(:field_assigned_to), avatar(@issue.assigned_to, :size => "14").to_s.html_safe + (@issue.assigned_to ? link_to_user(@issue.assigned_to) : "-"), :class => 'assigned-to'
   end
   unless @issue.disabled_core_fields.include?('category_id')
-    rows.left l(:field_category), h(@issue.category ? @issue.category.name : "-"), :class => 'category'
+    rows.left l(:field_category), (@issue.category ? @issue.category.name : "-"), :class => 'category'
   end
   unless @issue.disabled_core_fields.include?('fixed_version_id')
     rows.left l(:field_fixed_version), (@issue.fixed_version ? link_to_version(@issue.fixed_version) : "-"), :class => 'fixed-version'
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index 778f1d3cd..434f46ce8 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -2,7 +2,7 @@
 <html lang="<%= current_language %>">
 <head>
 <meta charset="utf-8" />
-<title><%=h html_title %></title>
+<title><%= html_title %></title>
 <meta name="description" content="<%= Redmine::Info.app_name %>" />
 <meta name="keywords" content="issue,bug,tracker" />
 <%= csrf_meta_tag %>
@@ -15,7 +15,7 @@
 <!-- page specific tags -->
 <%= yield :header_tags -%>
 </head>
-<body class="<%=h body_css_classes %>">
+<body class="<%= body_css_classes %>">
 <div id="wrapper">
 <div id="wrapper2">
 <div id="wrapper3">
diff --git a/app/views/mailer/_issue.html.erb b/app/views/mailer/_issue.html.erb
index 6b84a5be1..9461d8490 100644
--- a/app/views/mailer/_issue.html.erb
+++ b/app/views/mailer/_issue.html.erb
@@ -1,4 +1,4 @@
-<h1><%= link_to(h("#{issue.tracker.name} ##{issue.id}: #{issue.subject}"), issue_url) %></h1>
+<h1><%= link_to("#{issue.tracker.name} ##{issue.id}: #{issue.subject}", issue_url) %></h1>
 
 <%= render_email_issue_attributes(issue, users.first, true) %>
 
diff --git a/app/views/mailer/account_activated.html.erb b/app/views/mailer/account_activated.html.erb
index cb8d8caa1..6dc952238 100644
--- a/app/views/mailer/account_activated.html.erb
+++ b/app/views/mailer/account_activated.html.erb
@@ -1,2 +1,2 @@
 <p><%= l(:notice_account_activated) %></p>
-<p><%= l(:label_login) %>: <%= link_to h(@login_url), @login_url %></p>
+<p><%= l(:label_login) %>: <%= link_to @login_url, @login_url %></p>
diff --git a/app/views/mailer/account_activation_request.html.erb b/app/views/mailer/account_activation_request.html.erb
index 4450631b9..b19cf3219 100644
--- a/app/views/mailer/account_activation_request.html.erb
+++ b/app/views/mailer/account_activation_request.html.erb
@@ -1,2 +1,2 @@
 <p><%= l(:mail_body_account_activation_request, h(@user.login)) %></p>
-<p><%= link_to h(@url), @url %></p>
+<p><%= link_to @url, @url %></p>
diff --git a/app/views/mailer/account_information.html.erb b/app/views/mailer/account_information.html.erb
index 426aacee1..4d4066d65 100644
--- a/app/views/mailer/account_information.html.erb
+++ b/app/views/mailer/account_information.html.erb
@@ -3,9 +3,9 @@
 <% else %>
 <p><%= l(:mail_body_account_information) %>:</p>
 <ul>
-    <li><%= l(:field_login) %>: <%=h @user.login %></li>
-    <li><%= l(:field_password) %>: <%=h @password %></li>
+    <li><%= l(:field_login) %>: <%= @user.login %></li>
+    <li><%= l(:field_password) %>: <%= @password %></li>
 </ul>
 <% end %>
 
-<p><%= l(:label_login) %>: <%= link_to h(@login_url), @login_url %></p>
+<p><%= l(:label_login) %>: <%= link_to @login_url, @login_url %></p>
diff --git a/app/views/mailer/attachments_added.html.erb b/app/views/mailer/attachments_added.html.erb
index 11d1cf54c..d2355b1c4 100644
--- a/app/views/mailer/attachments_added.html.erb
+++ b/app/views/mailer/attachments_added.html.erb
@@ -1,5 +1,5 @@
-<%= link_to h(@added_to), @added_to_url %><br />
+<%= link_to @added_to, @added_to_url %><br />
 
 <ul><% @attachments.each do |attachment | %>
-<li><%=h attachment.filename %></li>
+<li><%= attachment.filename %></li>
 <% end %></ul>
diff --git a/app/views/mailer/document_added.html.erb b/app/views/mailer/document_added.html.erb
index 8606dd784..e3ece786d 100644
--- a/app/views/mailer/document_added.html.erb
+++ b/app/views/mailer/document_added.html.erb
@@ -1,3 +1,3 @@
-<%= link_to(h(@document.title), @document_url) %> (<%=h @document.category.name %>)<br />
+<%= link_to(@document.title, @document_url) %> (<%= @document.category.name %>)<br />
 <br />
 <%= textilizable(@document, :description, :only_path => false) %>
diff --git a/app/views/mailer/lost_password.html.erb b/app/views/mailer/lost_password.html.erb
index d740480ad..9294bcfae 100644
--- a/app/views/mailer/lost_password.html.erb
+++ b/app/views/mailer/lost_password.html.erb
@@ -1,4 +1,4 @@
 <p><%= l(:mail_body_lost_password) %><br />
-<%= link_to h(@url), @url %></p>
+<%= link_to @url, @url %></p>
 
-<p><%= l(:field_login) %>: <b><%=h @token.user.login %></b></p>
+<p><%= l(:field_login) %>: <b><%= @token.user.login %></b></p>
diff --git a/app/views/mailer/message_posted.html.erb b/app/views/mailer/message_posted.html.erb
index f43a8cf0f..3401b1816 100644
--- a/app/views/mailer/message_posted.html.erb
+++ b/app/views/mailer/message_posted.html.erb
@@ -1,4 +1,4 @@
-<h1><%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url) %></h1>
-<em><%=h @message.author %></em>
+<h1><%= @message.board.project.name %> - <%= @message.board.name %>: <%= link_to(@message.subject, @message_url) %></h1>
+<em><%= @message.author %></em>
 
 <%= textilizable(@message, :content, :only_path => false) %>
diff --git a/app/views/mailer/news_added.html.erb b/app/views/mailer/news_added.html.erb
index 758ebccb8..daf250adf 100644
--- a/app/views/mailer/news_added.html.erb
+++ b/app/views/mailer/news_added.html.erb
@@ -1,4 +1,4 @@
-<h1><%= link_to(h(@news.title), @news_url) %></h1>
-<em><%=h @news.author.name %></em>
+<h1><%= link_to(@news.title, @news_url) %></h1>
+<em><%= @news.author.name %></em>
 
 <%= textilizable(@news, :description, :only_path => false) %>
diff --git a/app/views/mailer/news_comment_added.html.erb b/app/views/mailer/news_comment_added.html.erb
index ef2be0f65..c9cc2a78e 100644
--- a/app/views/mailer/news_comment_added.html.erb
+++ b/app/views/mailer/news_comment_added.html.erb
@@ -1,4 +1,4 @@
-<h1><%= link_to(h(@news.title), @news_url) %></h1>
+<h1><%= link_to(@news.title, @news_url) %></h1>
 
 <p><%= l(:text_user_wrote, :value => h(@comment.author)) %></p>
 
diff --git a/app/views/mailer/register.html.erb b/app/views/mailer/register.html.erb
index 282deca90..5e8f6dfcf 100644
--- a/app/views/mailer/register.html.erb
+++ b/app/views/mailer/register.html.erb
@@ -1,2 +1,2 @@
 <p><%= l(:mail_body_register) %><br />
-<%= link_to h(@url), @url %></p>
+<%= link_to @url, @url %></p>
diff --git a/app/views/mailer/test_email.html.erb b/app/views/mailer/test_email.html.erb
index 1e81b3bfe..c73f0e341 100644
--- a/app/views/mailer/test_email.html.erb
+++ b/app/views/mailer/test_email.html.erb
@@ -1,2 +1,2 @@
 <p>This is a test email sent by Redmine.<br />
-Redmine URL: <%= link_to h(@url), @url %></p>
+Redmine URL: <%= link_to @url, @url %></p>
diff --git a/app/views/mailer/wiki_content_added.html.erb b/app/views/mailer/wiki_content_added.html.erb
index 8c83f62c8..f6d92a9d8 100644
--- a/app/views/mailer/wiki_content_added.html.erb
+++ b/app/views/mailer/wiki_content_added.html.erb
@@ -1,3 +1,3 @@
-<p><%= l(:mail_body_wiki_content_added, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url),
+<p><%= l(:mail_body_wiki_content_added, :id => link_to(@wiki_content.page.pretty_title, @wiki_content_url),
                                         :author => h(@wiki_content.author)).html_safe %><br />
-<em><%=h @wiki_content.comments %></em></p>
+<em><%= @wiki_content.comments %></em></p>
diff --git a/app/views/mailer/wiki_content_updated.html.erb b/app/views/mailer/wiki_content_updated.html.erb
index f1f3857bd..83a9a1675 100644
--- a/app/views/mailer/wiki_content_updated.html.erb
+++ b/app/views/mailer/wiki_content_updated.html.erb
@@ -1,6 +1,6 @@
-<p><%= l(:mail_body_wiki_content_updated, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url),
+<p><%= l(:mail_body_wiki_content_updated, :id => link_to(@wiki_content.page.pretty_title, @wiki_content_url),
                                           :author => h(@wiki_content.author)).html_safe %><br />
-<em><%=h @wiki_content.comments %></em></p>
+<em><%= @wiki_content.comments %></em></p>
 
 <p><%= l(:label_view_diff) %>:<br />
-<%= link_to h(@wiki_diff_url), @wiki_diff_url %></p>
+<%= link_to @wiki_diff_url, @wiki_diff_url %></p>
diff --git a/app/views/messages/edit.html.erb b/app/views/messages/edit.html.erb
index 7ce0560bb..53948e4da 100644
--- a/app/views/messages/edit.html.erb
+++ b/app/views/messages/edit.html.erb
@@ -1,6 +1,6 @@
 <%= board_breadcrumb(@message) %>
 
-<h2><%= avatar(@topic.author, :size => "24") %><%=h @topic.subject %></h2>
+<h2><%= avatar(@topic.author, :size => "24") %><%= @topic.subject %></h2>
 
 <%= form_for @message, {
                :as => :message,
diff --git a/app/views/messages/new.html.erb b/app/views/messages/new.html.erb
index fbdac695f..f8d840694 100644
--- a/app/views/messages/new.html.erb
+++ b/app/views/messages/new.html.erb
@@ -1,4 +1,4 @@
-<h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%= l(:label_message_new) %></h2>
+<h2><%= link_to @board.name, :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%= l(:label_message_new) %></h2>
 
 <%= form_for @message, :url => {:action => 'new'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index cb5e84a87..533be20bb 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -22,7 +22,7 @@
          ) if @message.destroyable_by?(User.current) %>
 </div>
 
-<h2><%= avatar(@topic.author, :size => "24") %><%=h @topic.subject %></h2>
+<h2><%= avatar(@topic.author, :size => "24") %><%= @topic.subject %></h2>
 
 <div class="message">
 <p><span class="author"><%= authoring @topic.created_on, @topic.author %></span></p>
@@ -59,7 +59,7 @@
     </div>
   <h4>
     <%= avatar(message.author, :size => "24") %>
-    <%= link_to h(message.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => @topic, :r => message, :anchor => "message-#{message.id}" } %>
+    <%= link_to message.subject, { :controller => 'messages', :action => 'show', :board_id => @board, :id => @topic, :r => message, :anchor => "message-#{message.id}" } %>
     -
     <%= authoring message.created_on, message.author %>
   </h4>
diff --git a/app/views/my/_sidebar.html.erb b/app/views/my/_sidebar.html.erb
index 4c9270fc7..a35bcaf77 100644
--- a/app/views/my/_sidebar.html.erb
+++ b/app/views/my/_sidebar.html.erb
@@ -22,7 +22,7 @@
 <h4><%= l(:label_api_access_key) %></h4>
 <div>
   <%= link_to_function(l(:button_show), "$('#api-access-key').toggle();")%>
-  <pre id='api-access-key' class='autoscroll'><%= h(@user.api_key) %></pre>
+  <pre id='api-access-key' class='autoscroll'><%= @user.api_key %></pre>
 </div>
 <%= javascript_tag("$('#api-access-key').hide();") %>
 <p>
diff --git a/app/views/my/blocks/_timelog.html.erb b/app/views/my/blocks/_timelog.html.erb
index f88de9549..747039c85 100644
--- a/app/views/my/blocks/_timelog.html.erb
+++ b/app/views/my/blocks/_timelog.html.erb
@@ -36,9 +36,9 @@ entries_by_day = entries.group_by(&:spent_on)
     </tr>
     <% entries_by_day[day].each do |entry| -%>
     <tr class="time-entry" style="border-bottom: 1px solid #f5f5f5;">
-    <td class="activity"><%=h entry.activity %></td>
-    <td class="subject"><%=h entry.project %> <%= h(' - ') + link_to_issue(entry.issue, :truncate => 50) if entry.issue %></td>
-    <td class="comments"><%=h entry.comments %></td>
+    <td class="activity"><%= entry.activity %></td>
+    <td class="subject"><%= entry.project %> <%= h(' - ') + link_to_issue(entry.issue, :truncate => 50) if entry.issue %></td>
+    <td class="comments"><%= entry.comments %></td>
     <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
     <td class="buttons">
     <% if entry.editable_by?(@user) -%>
diff --git a/app/views/news/_news.html.erb b/app/views/news/_news.html.erb
index cc83d2a9e..391d9a900 100644
--- a/app/views/news/_news.html.erb
+++ b/app/views/news/_news.html.erb
@@ -1,6 +1,6 @@
 <p><%= link_to_project(news.project) + ': ' unless @project %>
-<%= link_to h(news.title), news_path(news) %>
+<%= link_to news.title, news_path(news) %>
 <% if news.comments_count > 0 %><span class="comments">(<%= l(:label_x_comments, :count => news.comments_count) %>)</span><% end %>
 <br />
-<% unless news.summary.blank? %><span class="summary"><%=h news.summary %></span><br /><% end %>
+<% unless news.summary.blank? %><span class="summary"><%= news.summary %></span><br /><% end %>
 <span class="author"><%= authoring news.created_on, news.author %></span></p>
diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb
index 614a7b1f7..4560ac4fd 100644
--- a/app/views/news/index.html.erb
+++ b/app/views/news/index.html.erb
@@ -25,7 +25,7 @@
 <% else %>
 <% @newss.each do |news| %>
     <h3><%= avatar(news.author, :size => "24") %><%= link_to_project(news.project) + ': ' unless news.project == @project %>
-    <%= link_to h(news.title), news_path(news) %>
+    <%= link_to news.title, news_path(news) %>
     <%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %></h3>
     <p class="author"><%= authoring news.created_on, news.author %></p>
     <div class="wiki">
diff --git a/app/views/news/show.html.erb b/app/views/news/show.html.erb
index d359e90b9..c188d2e2c 100644
--- a/app/views/news/show.html.erb
+++ b/app/views/news/show.html.erb
@@ -23,7 +23,7 @@
 </div>
 <% end %>
 
-<p><% unless @news.summary.blank? %><em><%=h @news.summary %></em><br /><% end %>
+<p><% unless @news.summary.blank? %><em><%= @news.summary %></em><br /><% end %>
 <span class="author"><%= authoring @news.created_on, @news.author %></span></p>
 <div class="wiki">
 <%= textilizable(@news, :description) %>
diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb
index a670a03b6..e13604c36 100644
--- a/app/views/projects/_form.html.erb
+++ b/app/views/projects/_form.html.erb
@@ -46,7 +46,7 @@
 <% @trackers.each do |tracker| %>
     <label class="floating">
     <%= check_box_tag 'project[tracker_ids][]', tracker.id, @project.trackers.to_a.include?(tracker), :id => nil %>
-    <%=h tracker %>
+    <%= tracker %>
     </label>
 <% end %>
 <%= hidden_field_tag 'project[tracker_ids][]', '' %>
@@ -60,7 +60,7 @@
   <%= check_box_tag 'project[issue_custom_field_ids][]', custom_field.id, (@project.all_issue_custom_fields.include? custom_field),
         :disabled => (custom_field.is_for_all? ? "disabled" : nil),
         :id => nil %>
-  <%=h custom_field.name %>
+  <%= custom_field.name %>
   </label>
 <% end %>
 <%= hidden_field_tag 'project[issue_custom_field_ids][]', '' %>
diff --git a/app/views/projects/_members_box.html.erb b/app/views/projects/_members_box.html.erb
index e8c8114c4..7ac4b2cd7 100644
--- a/app/views/projects/_members_box.html.erb
+++ b/app/views/projects/_members_box.html.erb
@@ -2,7 +2,7 @@
   <div class="members box">
     <h3><%=l(:label_member_plural)%></h3>
     <% @users_by_role.keys.sort.each do |role| %>
-      <p><span class="label"><%=h role %>:</span> <%= @users_by_role[role].sort.collect{|u| link_to_user u}.join(", ").html_safe %></p>
+      <p><span class="label"><%= role %>:</span> <%= @users_by_role[role].sort.collect{|u| link_to_user u}.join(", ").html_safe %></p>
     <% end %>
   </div>
   <% end %>
diff --git a/app/views/projects/destroy.html.erb b/app/views/projects/destroy.html.erb
index ac392b72c..ca5ae1723 100644
--- a/app/views/projects/destroy.html.erb
+++ b/app/views/projects/destroy.html.erb
@@ -6,7 +6,7 @@
 
 <% if @project_to_destroy.descendants.any? %>
 <br /><%= l(:text_subprojects_destroy_warning,
-          content_tag('strong', h(@project_to_destroy.descendants.collect{|p| p.to_s}.join(', ')))).html_safe %>
+          content_tag('strong', @project_to_destroy.descendants.collect{|p| p.to_s}.join(', '))).html_safe %>
 <% end %>
 </p>
 <p>
diff --git a/app/views/projects/list_members.html.erb b/app/views/projects/list_members.html.erb
index 04de16044..7f2ae3795 100644
--- a/app/views/projects/list_members.html.erb
+++ b/app/views/projects/list_members.html.erb
@@ -4,7 +4,7 @@
 
 <% members = @members.group_by {|m| m.role } %>
 <% members.keys.sort{|x,y| x.position <=> y.position}.each do |role| %>
-<h3><%= h(role.name) %></h3>
+<h3><%= role.name %></h3>
 <ul>
 <% members[role].each do |m| %>
 <li><%= link_to_user m.user %> (<%= format_date m.created_on %>)</li>
diff --git a/app/views/projects/settings/_activities.html.erb b/app/views/projects/settings/_activities.html.erb
index 65c26f57c..db1a3c286 100644
--- a/app/views/projects/settings/_activities.html.erb
+++ b/app/views/projects/settings/_activities.html.erb
@@ -5,7 +5,7 @@
     <th><%= l(:field_name) %></th>
     <th><%= l(:enumeration_system_activity) %></th>
     <% TimeEntryActivity.new.available_custom_fields.each do |value| %>
-    <th><%= h value.name %></th>
+    <th><%= value.name %></th>
     <% end %>
     <th><%= l(:field_active) %></th>
   </tr></thead>
@@ -15,7 +15,7 @@
   <tr class="<%= cycle('odd', 'even') %>">
     <td class="name">
       <%= ff.hidden_field :parent_id, :value => enumeration.id unless enumeration.project %>
-      <%= h(enumeration) %>
+      <%= enumeration %>
     </td>
     <td class="tick"><%= checked_image !enumeration.project %></td>
     <% enumeration.custom_field_values.each do |value| %>
diff --git a/app/views/projects/settings/_boards.html.erb b/app/views/projects/settings/_boards.html.erb
index b6a460b97..f115c2866 100644
--- a/app/views/projects/settings/_boards.html.erb
+++ b/app/views/projects/settings/_boards.html.erb
@@ -11,7 +11,7 @@
   next if board.new_record? %>
   <tr class="<%= cycle 'odd', 'even' %>">
     <td class="name" style="padding-left: <%= level * 18 %>px;"><%= link_to board.name, project_board_path(@project, board) %></td>
-    <td class="description"><%=h board.description %></td>
+    <td class="description"><%= board.description %></td>
     <td class="reorder">
     <% if authorize_for("boards", "edit") %>
       <%= reorder_links('board', {:controller => 'boards', :action => 'update', :project_id => @project, :id => board}, :put) %>
diff --git a/app/views/projects/settings/_issue_categories.html.erb b/app/views/projects/settings/_issue_categories.html.erb
index 7c56fb667..8a04f2555 100644
--- a/app/views/projects/settings/_issue_categories.html.erb
+++ b/app/views/projects/settings/_issue_categories.html.erb
@@ -9,8 +9,8 @@
 <% for category in @project.issue_categories %>
   <% unless category.new_record? %>
   <tr class="<%= cycle 'odd', 'even' %>">
-    <td class="name"><%=h(category.name) %></td>
-    <td><%=h(category.assigned_to.name) if category.assigned_to %></td>
+    <td class="name"><%= category.name  %></td>
+    <td><%= category.assigned_to.name if category.assigned_to %></td>
     <td class="buttons">
       <% if User.current.allowed_to?(:manage_categories, @project) %>
         <%= link_to l(:button_edit), edit_issue_category_path(category), :class => 'icon icon-edit' %>
diff --git a/app/views/projects/settings/_repositories.html.erb b/app/views/projects/settings/_repositories.html.erb
index 9352963cf..e60164caa 100644
--- a/app/views/projects/settings/_repositories.html.erb
+++ b/app/views/projects/settings/_repositories.html.erb
@@ -17,8 +17,8 @@
             {:controller => 'repositories', :action => 'show',:id => @project, :repository_id => repository.identifier_param} if repository.identifier.present? %>
       </td>
       <td><%= checked_image repository.is_default? %></td>
-      <td><%=h repository.scm_name %></td>
-      <td><%=h repository.url %></td>
+      <td><%= repository.scm_name %></td>
+      <td><%= repository.url %></td>
       <td class="buttons">
       <% if User.current.allowed_to?(:manage_repository, @project) %>
         <%= link_to(l(:label_user_plural), committers_repository_path(repository),
diff --git a/app/views/projects/settings/_versions.html.erb b/app/views/projects/settings/_versions.html.erb
index 778803bf3..d33788a5a 100644
--- a/app/views/projects/settings/_versions.html.erb
+++ b/app/views/projects/settings/_versions.html.erb
@@ -14,10 +14,10 @@
     <tr class="version <%= cycle 'odd', 'even' %> <%=h version.status %> <%= 'shared' if version.project != @project %>">
     <td class="name"><%= link_to_version version %></td>
     <td class="date"><%= format_date(version.effective_date) %></td>
-    <td class="description"><%=h version.description %></td>
+    <td class="description"><%= version.description %></td>
     <td class="status"><%= l("version_status_#{version.status}") %></td>
     <td class="sharing"><%=h format_version_sharing(version.sharing) %></td>
-    <td><%= link_to_if_authorized(h(version.wiki_page_title), {:controller => 'wiki', :action => 'show', :project_id => version.project, :id => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %></td>
+    <td><%= link_to_if_authorized(version.wiki_page_title, {:controller => 'wiki', :action => 'show', :project_id => version.project, :id => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %></td>
     <td class="buttons">
       <% if version.project == @project && User.current.allowed_to?(:manage_versions, @project) %>
         <%= link_to l(:button_edit), edit_version_path(version), :class => 'icon icon-edit' %>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index addcfdf62..dce288e4c 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -25,7 +25,7 @@
   <% end %>
   <ul>
   <% unless @project.homepage.blank? %>
-    <li><span class="label"><%=l(:field_homepage)%>:</span> <%= link_to h(@project.homepage), @project.homepage %></li>
+    <li><span class="label"><%=l(:field_homepage)%>:</span> <%= link_to @project.homepage, @project.homepage %></li>
   <% end %>
   <% if @subprojects.any? %>
     <li><span class="label"><%=l(:label_subproject_plural)%>:</span>
@@ -41,7 +41,7 @@
     <h3><%=l(:label_issue_tracking)%></h3>
     <ul>
     <% for tracker in @trackers %>
-      <li><%= link_to h(tracker.name), project_issues_path(@project, :set_filter => 1, :tracker_id => tracker.id) %>:
+      <li><%= link_to tracker.name, project_issues_path(@project, :set_filter => 1, :tracker_id => tracker.id) %>:
           <%= l(:label_x_open_issues_abbr_on_total, :count => @open_issues_by_tracker[tracker].to_i,
                                                     :total => @total_issues_by_tracker[tracker].to_i) %>
       </li>
diff --git a/app/views/queries/index.html.erb b/app/views/queries/index.html.erb
index 98b0dfb72..b0dbc05be 100644
--- a/app/views/queries/index.html.erb
+++ b/app/views/queries/index.html.erb
@@ -11,7 +11,7 @@
   <% @queries.each do |query| %>
     <tr class="<%= cycle('odd', 'even') %>">
       <td class="name">
-        <%= link_to h(query.name), :controller => 'issues', :action => 'index', :project_id => @project, :query_id => query %>
+        <%= link_to query.name, :controller => 'issues', :action => 'index', :project_id => @project, :query_id => query %>
       </td>
       <td class="buttons">
         <% if query.editable_by?(User.current) %>
diff --git a/app/views/reports/_details.html.erb b/app/views/reports/_details.html.erb
index 7d2ea4dcb..ab7fe3620 100644
--- a/app/views/reports/_details.html.erb
+++ b/app/views/reports/_details.html.erb
@@ -5,7 +5,7 @@
 <thead><tr>
 <th></th>
 <% for status in @statuses %>
-<th><%=h status.name %></th>
+<th><%= status.name %></th>
 <% end %>
 <th><strong><%=l(:label_open_issues_plural)%></strong></th>
 <th><strong><%=l(:label_closed_issues_plural)%></strong></th>
@@ -14,7 +14,7 @@
 <tbody>
 <% for row in rows %>
 <tr class="<%= cycle("odd", "even") %>">
-  <td class="name"><%= link_to h(row.name), aggregate_path(@project, field_name, row) %></td>
+  <td class="name"><%= link_to row.name, aggregate_path(@project, field_name, row) %></td>
   <% for status in @statuses %>
     <td><%= aggregate_link data, { field_name => row.id, "status_id" => status.id }, aggregate_path(@project, field_name, row, :status_id => status.id) %></td>
   <% end %>
diff --git a/app/views/reports/_simple.html.erb b/app/views/reports/_simple.html.erb
index 8cfefe8a7..9dca3554c 100644
--- a/app/views/reports/_simple.html.erb
+++ b/app/views/reports/_simple.html.erb
@@ -11,7 +11,7 @@
 <tbody>
 <% for row in rows %>
 <tr class="<%= cycle("odd", "even") %>">
-  <td class="name"><%= link_to h(row.name), aggregate_path(@project, field_name, row) %></td>
+  <td class="name"><%= link_to row.name, aggregate_path(@project, field_name, row) %></td>
   <td><%= aggregate_link data, { field_name => row.id, "closed" => 0 }, aggregate_path(@project, field_name, row, :status_id => "o") %></td>
   <td><%= aggregate_link data, { field_name => row.id, "closed" => 1 }, aggregate_path(@project, field_name, row, :status_id => "c") %></td>
   <td><%= aggregate_link data, { field_name => row.id }, aggregate_path(@project, field_name, row, :status_id => "*") %></td>
diff --git a/app/views/repositories/_breadcrumbs.html.erb b/app/views/repositories/_breadcrumbs.html.erb
index 20c2040e5..eb115f9ad 100644
--- a/app/views/repositories/_breadcrumbs.html.erb
+++ b/app/views/repositories/_breadcrumbs.html.erb
@@ -1,4 +1,4 @@
-<%= link_to(@repository.identifier.present? ? h(@repository.identifier) : 'root',
+<%= link_to(@repository.identifier.present? ? @repository.identifier : 'root',
       :action => 'show', :id => @project,
       :repository_id => @repository.identifier_param,
       :path => nil, :rev => @rev) %>
@@ -13,11 +13,11 @@ dirs.each do |dir|
     link_path << '/' unless link_path.empty?
     link_path << "#{dir}"
     %>
-    / <%= link_to h(dir), :action => 'show', :id => @project, :repository_id => @repository.identifier_param,
+    / <%= link_to dir, :action => 'show', :id => @project, :repository_id => @repository.identifier_param,
                 :path => to_path_param(link_path), :rev => @rev %>
 <% end %>
 <% if filename %>
-    / <%= link_to h(filename),
+    / <%= link_to filename,
                    :action => 'changes', :id => @project, :repository_id => @repository.identifier_param,
                    :path => to_path_param("#{link_path}/#{filename}"), :rev => @rev %>
 <% end %>
@@ -26,6 +26,6 @@ dirs.each do |dir|
   # For Mercurial *tip*, @rev and @changeset are nil.
   rev_text = @changeset.nil? ? @rev : format_revision(@changeset)
 %>
-<%= "@ #{h rev_text}" unless rev_text.blank? %>
+<%= "@ #{rev_text}" unless rev_text.blank? %>
 
 <% html_title(with_leading_slash(path)) -%>
diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb
index 21f205ad7..9721fa66c 100644
--- a/app/views/repositories/_dir_list_content.html.erb
+++ b/app/views/repositories/_dir_list_content.html.erb
@@ -3,7 +3,7 @@
    depth = params[:depth].to_i %>
 <%  ent_path = Redmine::CodesetUtil.replace_invalid_utf8(entry.path)   %>
 <%  ent_name = Redmine::CodesetUtil.replace_invalid_utf8(entry.name)   %>
-<tr id="<%= tr_id %>" class="<%= h params[:parent_id] %> entry <%= entry.kind %>">
+<tr id="<%= tr_id %>" class="<%= params[:parent_id] %> entry <%= entry.kind %>">
 <td style="padding-left: <%=18 * depth%>px;" class="<%=
            @repository.report_last_commit ? "filename" : "filename_no_report" %>">
 <% if entry.is_dir? %>
@@ -16,7 +16,7 @@
                        :depth  => (depth + 1),
                        :parent_id => tr_id)) %>');">&nbsp;</span>
 <% end %>
-<%=  link_to h(ent_name),
+<%=  link_to ent_name,
           {:action => (entry.is_dir? ? 'show' : 'changes'), :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(ent_path), :rev => @rev},
           :class => (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
 </td>
diff --git a/app/views/repositories/committers.html.erb b/app/views/repositories/committers.html.erb
index d9c2d5d96..b942e4b82 100644
--- a/app/views/repositories/committers.html.erb
+++ b/app/views/repositories/committers.html.erb
@@ -18,7 +18,7 @@
 <% i = 0 -%>
 <% @committers.each do |committer, user_id| -%>
   <tr class="<%= cycle 'odd', 'even' %>">
-    <td><%=h committer %></td>
+    <td><%= committer %></td>
     <td>
       <%= hidden_field_tag "committers[#{i}][]", committer, :id => nil %>
       <%= select_tag "committers[#{i}][]",
diff --git a/app/views/repositories/revision.html.erb b/app/views/repositories/revision.html.erb
index 64dfd75ea..13edf07cb 100644
--- a/app/views/repositories/revision.html.erb
+++ b/app/views/repositories/revision.html.erb
@@ -32,7 +32,7 @@
 <table class="revision-info">
   <% if @changeset.scmid.present? %>
     <tr>
-      <td>ID</td><td><%= h(@changeset.scmid) %></td>
+      <td>ID</td><td><%= @changeset.scmid %></td>
     </tr>
   <% end %>
   <% if @changeset.parents.present? %>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index fcf0a0e0d..b89bbf9fe 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -61,7 +61,7 @@
     <h3><%= l(:label_repository_plural) %></h3>
     <p>
       <%= @repositories.sort.collect {|repo|
-          link_to h(repo.name), 
+          link_to repo.name, 
                   {:controller => 'repositories', :action => 'show',
                    :id => @project, :repository_id => repo.identifier_param, :rev => nil, :path => nil},
                   :class => 'repository' + (repo == @repository ? ' selected' : '')
diff --git a/app/views/roles/index.html.erb b/app/views/roles/index.html.erb
index 19a6c42c4..9545d5509 100644
--- a/app/views/roles/index.html.erb
+++ b/app/views/roles/index.html.erb
@@ -14,7 +14,7 @@
   <tbody>
 <% for role in @roles %>
   <tr class="<%= cycle("odd", "even") %>">
-  <td class="name"><%= content_tag(role.builtin? ? 'em' : 'span', link_to(h(role.name), edit_role_path(role))) %></td>
+  <td class="name"><%= content_tag(role.builtin? ? 'em' : 'span', link_to(role.name, edit_role_path(role))) %></td>
   <td class="reorder">
   <% unless role.builtin? %>
     <%= reorder_links('role', {:action => 'update', :id => role, :page => params[:page]}, :put) %>
diff --git a/app/views/roles/permissions.html.erb b/app/views/roles/permissions.html.erb
index 13a072ff3..cea4bd9e6 100644
--- a/app/views/roles/permissions.html.erb
+++ b/app/views/roles/permissions.html.erb
@@ -9,7 +9,7 @@
     <th><%=l(:label_permissions)%></th>
     <% @roles.each do |role| %>
     <th>
-        <%= content_tag(role.builtin? ? 'em' : 'span', h(role.name)) %>
+        <%= content_tag(role.builtin? ? 'em' : 'span', role.name) %>
         <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('input.role-#{role.id}')",
                                                             :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
     </th>
@@ -26,7 +26,7 @@
             <%= l_or_humanize(mod, :prefix => 'project_module_') %>
           </td>
           <% @roles.each do |role| %>
-          <td class="role"><%= h(role.name) %></td>
+          <td class="role"><%= role.name %></td>
           <% end %>
         </tr>
     <% end %>
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index 2f0b06a6c..35d0d0bf7 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -42,7 +42,7 @@
     <dl id="search-results">
       <% @results.each do |e| %>
         <dt class="<%= e.event_type %>">
-          <%= content_tag('span', h(e.project), :class => 'project') unless @project == e.project %>
+          <%= content_tag('span', e.project, :class => 'project') unless @project == e.project %>
           <%= link_to(highlight_tokens(e.event_title.truncate(255), @tokens), e.event_url) %>
         </dt>
         <dd><span class="description"><%= highlight_tokens(e.event_description, @tokens) %></span>
diff --git a/app/views/timelog/_form.html.erb b/app/views/timelog/_form.html.erb
index 955c2d06b..9b078013d 100644
--- a/app/views/timelog/_form.html.erb
+++ b/app/views/timelog/_form.html.erb
@@ -13,7 +13,7 @@
   <% end %>
   <p>
     <%= f.text_field :issue_id, :size => 6 %>
-    <span id="time_entry_issue"><%= h("#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}") if @time_entry.issue %></span>
+    <span id="time_entry_issue"><%= "#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}" if @time_entry.issue %></span>
   </p>
   <p><%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
   <p><%= f.text_field :hours, :size => 6, :required => true %></p>
diff --git a/app/views/timelog/_report_criteria.html.erb b/app/views/timelog/_report_criteria.html.erb
index 8ebb29e58..c86b219d1 100644
--- a/app/views/timelog/_report_criteria.html.erb
+++ b/app/views/timelog/_report_criteria.html.erb
@@ -3,7 +3,7 @@
 <% next if hours_for_value.empty? -%>
 <tr class="<%= cycle('odd', 'even') %> <%= criterias.length > level+1 ? 'subtotal' : 'last-level' %>">
 <%= ("<td></td>" * level).html_safe %>
-<td class="name"><%= h(format_criteria_value(@report.available_criteria[criterias[level]], value)) %></td>
+<td class="name"><%= format_criteria_value(@report.available_criteria[criterias[level]], value) %></td>
 <%= ("<td></td>" * (criterias.length - level - 1)).html_safe -%>
   <% total = 0 -%>
   <% @report.periods.each do |period| -%>
diff --git a/app/views/trackers/_form.html.erb b/app/views/trackers/_form.html.erb
index 5a7416548..107095540 100644
--- a/app/views/trackers/_form.html.erb
+++ b/app/views/trackers/_form.html.erb
@@ -27,7 +27,7 @@
   <% IssueCustomField.all.each do |field| %>
     <label class="block">
       <%= check_box_tag 'tracker[custom_field_ids][]',field.id, @tracker.custom_fields.to_a.include?(field), :id => nil %>
-      <%=h field.name %>
+      <%= field.name %>
     </label>
   <% end %>
 </p>
diff --git a/app/views/trackers/index.html.erb b/app/views/trackers/index.html.erb
index 64f06fc5c..f76a4f5db 100644
--- a/app/views/trackers/index.html.erb
+++ b/app/views/trackers/index.html.erb
@@ -15,7 +15,7 @@
   <tbody>
 <% for tracker in @trackers %>
   <tr class="<%= cycle("odd", "even") %>">
-  <td class="name"><%= link_to h(tracker.name), edit_tracker_path(tracker) %></td>
+  <td class="name"><%= link_to tracker.name, edit_tracker_path(tracker) %></td>
   <td>
     <% unless tracker.workflow_rules.count > 0 %>
       <span class="icon icon-warning">
diff --git a/app/views/users/_groups.html.erb b/app/views/users/_groups.html.erb
index 3b277abd7..204bd9d00 100644
--- a/app/views/users/_groups.html.erb
+++ b/app/views/users/_groups.html.erb
@@ -1,7 +1,7 @@
 <%= form_for(:user, :url => { :action => 'update' }, :html => {:method => :put}) do %>
 <div class="box">
 <% Group.givable.sort.each do |group| %>
-<label><%= check_box_tag 'user[group_ids][]', group.id, @user.groups.to_a.include?(group), :id => nil %> <%=h group %></label><br />
+<label><%= check_box_tag 'user[group_ids][]', group.id, @user.groups.to_a.include?(group), :id => nil %> <%= group %></label><br />
 <% end %>
 <%= hidden_field_tag 'user[group_ids][]', '' %>
 </div>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index fe3d6de44..a89712dad 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -37,10 +37,10 @@
   <tbody>
 <% for user in @users -%>
   <tr class="<%= user.css_classes %> <%= cycle("odd", "even") %>">
-  <td class="username"><%= avatar(user, :size => "14") %><%= link_to h(user.login), edit_user_path(user) %></td>
-  <td class="firstname"><%= h(user.firstname) %></td>
-  <td class="lastname"><%= h(user.lastname) %></td>
-  <td class="email"><%= mail_to(h(user.mail)) %></td>
+  <td class="username"><%= avatar(user, :size => "14") %><%= link_to user.login, edit_user_path(user) %></td>
+  <td class="firstname"><%= user.firstname %></td>
+  <td class="lastname"><%= user.lastname %></td>
+  <td class="email"><%= mail_to(user.mail) %></td>
   <td class="tick"><%= checked_image user.admin? %></td>
   <td class="created_on"><%= format_time(user.created_on) %></td>
   <td class="last_login_on"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index fd4a1b974..570be3154 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -2,7 +2,7 @@
 <%= link_to(l(:button_edit), edit_user_path(@user), :class => 'icon icon-edit') if User.current.admin? %>
 </div>
 
-<h2><%= avatar @user, :size => "50" %> <%=h @user.name %></h2>
+<h2><%= avatar @user, :size => "50" %> <%= @user.name %></h2>
 
 <div class="splitcontentleft">
 <ul>
@@ -10,11 +10,11 @@
     <li><%=l(:field_login)%>: <%= @user.login %></li>
   <% end %>
   <% unless @user.pref.hide_mail %>
-    <li><%=l(:field_mail)%>: <%= mail_to(h(@user.mail), nil, :encode => 'javascript') %></li>
+    <li><%=l(:field_mail)%>: <%= mail_to(@user.mail, nil, :encode => 'javascript') %></li>
   <% end %>
   <% @user.visible_custom_field_values.each do |custom_value| %>
   <% if !custom_value.value.blank? %>
-    <li><%=h custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
+    <li><%= custom_value.custom_field.name %>: <%= show_value(custom_value) %></li>
   <% end %>
   <% end %>
     <li><%=l(:label_registered_on)%>: <%= format_date(@user.created_on) %></li>
@@ -28,7 +28,7 @@
 <ul>
 <% for membership in @memberships %>
   <li><%= link_to_project(membership.project) %>
-    (<%=h membership.roles.sort.collect(&:to_s).join(', ') %>, <%= format_date(membership.created_on) %>)</li>
+    (<%= membership.roles.sort.collect(&:to_s).join(', ') %>, <%= format_date(membership.created_on) %>)</li>
 <% end %>
 </ul>
 <% end %>
@@ -53,7 +53,7 @@
 <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
   <dt class="<%= e.event_type %>">
   <span class="time"><%= format_time(e.event_datetime, false) %></span>
-  <%= content_tag('span', h(e.project), :class => 'project') %>
+  <%= content_tag('span', e.project, :class => 'project') %>
   <%= link_to format_activity_title(e.event_title), e.event_url %></dt>
   <dd><span class="description"><%= format_activity_description(e.event_description) %></span></dd>
 <% end -%>
diff --git a/app/views/versions/_issue_counts.html.erb b/app/views/versions/_issue_counts.html.erb
index 951cc0186..7d9652250 100644
--- a/app/views/versions/_issue_counts.html.erb
+++ b/app/views/versions/_issue_counts.html.erb
@@ -15,7 +15,7 @@
     <tr>
         <td style="width:130px; text-align:right;">
           <% if count[:group] -%>
-            <%= link_to(h(count[:group]), project_issues_path(version.project, :set_filter => 1, :status_id => '*', :fixed_version_id => version, "#{criteria}_id" => count[:group])) %>
+            <%= link_to(count[:group], project_issues_path(version.project, :set_filter => 1, :status_id => '*', :fixed_version_id => version, "#{criteria}_id" => count[:group])) %>
           <% else -%>
             <%= link_to(l(:label_none), project_issues_path(version.project, :set_filter => 1, :status_id => '*', :fixed_version_id => version, "#{criteria}_id" => "!*")) %>
           <% end %>
diff --git a/app/views/versions/show.html.erb b/app/views/versions/show.html.erb
index fdbec6ff6..d05729e51 100644
--- a/app/views/versions/show.html.erb
+++ b/app/views/versions/show.html.erb
@@ -5,7 +5,7 @@
 <%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>
 </div>
 
-<h2><%= h(@version.name) %></h2>
+<h2><%= @version.name %></h2>
 
 <div id="roadmap">
 <%= render :partial => 'versions/overview', :locals => {:version => @version} %>
diff --git a/app/views/wiki/annotate.html.erb b/app/views/wiki/annotate.html.erb
index b1b765909..950a5a77c 100644
--- a/app/views/wiki/annotate.html.erb
+++ b/app/views/wiki/annotate.html.erb
@@ -13,7 +13,7 @@
 <p>
   <em><%= @annotate.content.author ? link_to_user(@annotate.content.author) : l(:label_user_anonymous)
        %>, <%= format_time(@annotate.content.updated_on) %> </em><br />
-  <%=h @annotate.content.comments %>
+  <%= @annotate.content.comments %>
 </p>
 
 <% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %>
@@ -27,8 +27,8 @@
     <td class="revision"><%= link_to line[0], :controller => 'wiki',
                              :action => 'show', :project_id => @project,
                              :id => @page.title, :version => line[0] %></td>
-    <td class="author"><%= h(line[1]) %></td>
-    <td class="line-code"><pre><%=h line[2] %></pre></td>
+    <td class="author"><%= line[1] %></td>
+    <td class="line-code"><pre><%= line[2] %></pre></td>
 </tr>
 <% line_num += 1 %>
 <% end -%>
diff --git a/app/views/wiki/date_index.html.erb b/app/views/wiki/date_index.html.erb
index a543ef229..74a5f45fb 100644
--- a/app/views/wiki/date_index.html.erb
+++ b/app/views/wiki/date_index.html.erb
@@ -12,7 +12,7 @@
 <h3><%= format_date(date) %></h3>
 <ul>
 <% @pages_by_date[date].each do |page| %>
-    <li><%= link_to h(page.pretty_title), :action => 'show', :id => page.title, :project_id => page.project %></li>
+    <li><%= link_to page.pretty_title, :action => 'show', :id => page.title, :project_id => page.project %></li>
 <% end %>
 </ul>
 <% end %>
diff --git a/app/views/wiki/destroy.html.erb b/app/views/wiki/destroy.html.erb
index eebe250ca..d6270b685 100644
--- a/app/views/wiki/destroy.html.erb
+++ b/app/views/wiki/destroy.html.erb
@@ -1,6 +1,6 @@
 <%= wiki_page_breadcrumb(@page) %>
 
-<h2><%=h @page.pretty_title %></h2>
+<h2><%= @page.pretty_title %></h2>
 
 <%= form_tag({}, :method => :delete) do %>
 <div class="box">
diff --git a/app/views/wiki/edit.html.erb b/app/views/wiki/edit.html.erb
index 40e6b792a..2a2ba312a 100644
--- a/app/views/wiki/edit.html.erb
+++ b/app/views/wiki/edit.html.erb
@@ -1,6 +1,6 @@
 <%= wiki_page_breadcrumb(@page) %>
 
-<h2><%= h @page.pretty_title %></h2>
+<h2><%= @page.pretty_title %></h2>
 
 <%= form_for @content, :as => :content,
             :url => {:action => 'update', :id => @page.title},
diff --git a/app/views/wiki/export.html.erb b/app/views/wiki/export.html.erb
index da45423dc..a9df66dee 100644
--- a/app/views/wiki/export.html.erb
+++ b/app/views/wiki/export.html.erb
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
-<title><%=h @page.pretty_title %></title>
+<title><%= @page.pretty_title %></title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <style>
 body { font:80% Verdana,Tahoma,Arial,sans-serif; }
diff --git a/app/views/wiki/export_multiple.html.erb b/app/views/wiki/export_multiple.html.erb
index df8f74012..b068ce1d6 100644
--- a/app/views/wiki/export_multiple.html.erb
+++ b/app/views/wiki/export_multiple.html.erb
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
-<title><%=h @wiki.project.name %></title>
+<title><%= @wiki.project.name %></title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <style>
 body { font:80% Verdana,Tahoma,Arial,sans-serif; }
@@ -20,13 +20,13 @@ h1:hover a.wiki-anchor, h2:hover a.wiki-anchor, h3:hover a.wiki-anchor { display
 <strong><%= l(:label_index_by_title) %></strong>
 <ul>
 <% @pages.each do |page| %>
-    <li><a href="#<%= h(page.title) %>"><%= h(page.pretty_title) %></a></li>
+    <li><a href="#<%= page.title %>"><%= page.pretty_title %></a></li>
 <% end %>
 </ul>
 
 <% @pages.each do |page| %>
 <hr />
-<a name="<%= h(page.title) %>" />
+<a name="<%= page.title %>" />
 <%= textilizable page.content ,:text, :wiki_links => :anchor %>
 <% end %>
 
diff --git a/app/views/wiki/history.html.erb b/app/views/wiki/history.html.erb
index ebac6d514..136923460 100644
--- a/app/views/wiki/history.html.erb
+++ b/app/views/wiki/history.html.erb
@@ -20,12 +20,12 @@
 <% line_num = 1 %>
 <% @versions.each do |ver| %>
 <tr class="wiki-page-version <%= cycle("odd", "even") %>">
-    <td class="id"><%= link_to h(ver.version), :action => 'show', :id => @page.title, :project_id => @page.project, :version => ver.version %></td>
+    <td class="id"><%= link_to ver.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => ver.version %></td>
     <td class="checkbox"><%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('#cbto-#{line_num+1}').prop('checked', true);") if show_diff && (line_num < @versions.size) %></td>
     <td class="checkbox"><%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") if show_diff && (line_num > 1) %></td>
     <td class="updated_on"><%= format_time(ver.updated_on) %></td>
     <td class="author"><%= link_to_user ver.author %></td>
-    <td class="comments"><%=h ver.comments %></td>
+    <td class="comments"><%= ver.comments %></td>
     <td class="buttons">
       <%= link_to l(:button_annotate), :action => 'annotate', :id => @page.title, :version => ver.version %>
       <%= delete_link wiki_page_path(@page, :version => ver.version) if User.current.allowed_to?(:delete_wiki_pages, @page.project) && @version_count > 1 %>
diff --git a/app/views/wiki/rename.html.erb b/app/views/wiki/rename.html.erb
index c87641faf..ac88fd4bf 100644
--- a/app/views/wiki/rename.html.erb
+++ b/app/views/wiki/rename.html.erb
@@ -1,6 +1,6 @@
 <%= wiki_page_breadcrumb(@page) %>
 
-<h2><%= h @original_title %></h2>
+<h2><%= @original_title %></h2>
 
 <%= error_messages_for 'page' %>
 
diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb
index 3ff7d040b..a9db7a0c4 100644
--- a/app/views/wiki/show.html.erb
+++ b/app/views/wiki/show.html.erb
@@ -36,7 +36,7 @@
     <br />
     <em><%= @content.author ? link_to_user(@content.author) : l(:label_user_anonymous)
          %>, <%= format_time(@content.updated_on) %> </em><br />
-    <%=h @content.comments %>
+    <%= @content.comments %>
     </p>
     <hr />
 <% end %>
diff --git a/app/views/wikis/destroy.html.erb b/app/views/wikis/destroy.html.erb
index bc3360014..af7dc6c67 100644
--- a/app/views/wikis/destroy.html.erb
+++ b/app/views/wikis/destroy.html.erb
@@ -1,7 +1,7 @@
 <h2><%=l(:label_confirmation)%></h2>
 
 <div class="box"><center>
-<p><strong><%= h(@project.name) %></strong><br /><%=l(:text_wiki_destroy_confirmation)%></p>
+<p><strong><%= @project.name %></strong><br /><%=l(:text_wiki_destroy_confirmation)%></p>
 
 <%= form_tag({:controller => 'wikis', :action => 'destroy', :id => @project}) do %>
 <%= hidden_field_tag "confirm", 1 %>
diff --git a/app/views/workflows/_form.html.erb b/app/views/workflows/_form.html.erb
index 9c5ef62fb..a788a7a68 100644
--- a/app/views/workflows/_form.html.erb
+++ b/app/views/workflows/_form.html.erb
@@ -14,7 +14,7 @@
     <td style="width:<%= 75 / @statuses.size %>%;">
       <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('table.transitions-#{name} input.new-status-#{new_status.id}')",
                                                       :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
-      <%=h new_status.name %>
+      <%= new_status.name %>
     </td>
     <% end %>
   </tr>
@@ -26,7 +26,7 @@
       <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('table.transitions-#{name} input.old-status-#{old_status.id}')",
                                                           :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
 
-      <%=h old_status.name %>
+      <%= old_status.name %>
     </td>
     <% for new_status in @statuses -%>
     <% checked = workflows.detect {|w| w.old_status_id == old_status.id && w.new_status_id == new_status.id} %>
diff --git a/app/views/workflows/permissions.html.erb b/app/views/workflows/permissions.html.erb
index 2c529864e..7b4b3f840 100644
--- a/app/views/workflows/permissions.html.erb
+++ b/app/views/workflows/permissions.html.erb
@@ -47,7 +47,7 @@
         <td></td>
         <% for status in @statuses %>
         <td style="width:<%= 75 / @statuses.size %>%;">
-          <%=h status.name %>
+          <%= status.name %>
         </td>
         <% end %>
       </tr>
@@ -62,7 +62,7 @@
       <% @fields.each do |field, name| %>
       <tr class="<%= cycle("odd", "even") %>">
         <td class="name">
-          <%=h name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %>
+          <%= name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %>
         </td>
         <% for status in @statuses -%>
         <td class="<%= @permissions[status.id][field] %>">
@@ -82,7 +82,7 @@
         <% @custom_fields.each do |field| %>
         <tr class="<%= cycle("odd", "even") %>">
           <td class="name">
-            <%=h field.name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %>
+            <%= field.name %> <%= content_tag('span', '*', :class => 'required') if field_required?(field) %>
           </td>
           <% for status in @statuses -%>
           <td class="<%= @permissions[status.id][field.id.to_s] %>">