diff --git a/app/views/issues/bulk_edit.html.erb b/app/views/issues/bulk_edit.html.erb
index bec8e2987..3d23a990a 100644
--- a/app/views/issues/bulk_edit.html.erb
+++ b/app/views/issues/bulk_edit.html.erb
@@ -1,11 +1,10 @@
 <h2><%= @copy ? l(:button_copy) : l(:label_bulk_edit_selected_issues) %></h2>
 
-<ul><%= @issues.collect {|i|
-            content_tag('li',
-                        link_to(h("#{i.tracker} ##{i.id}"),
-                                { :action => 'show', :id => i }
-                            ) + h(": #{i.subject}"))
-         }.join("\n").html_safe %></ul>
+<ul>
+<% @issues.each do |issue| %>
+  <%= content_tag 'li', link_to_issue(issue) %>
+<% end %>
+</ul>
 
 <%= form_tag({:action => 'bulk_update'}, :id => 'bulk_edit_form') do %>
 <%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join("\n").html_safe %>
diff --git a/app/views/timelog/bulk_edit.html.erb b/app/views/timelog/bulk_edit.html.erb
index f1d4ed979..ac3511a77 100644
--- a/app/views/timelog/bulk_edit.html.erb
+++ b/app/views/timelog/bulk_edit.html.erb
@@ -1,10 +1,10 @@
 <h2><%= l(:label_bulk_edit_selected_time_entries) %></h2>
 
 <ul>
-<%= @time_entries.collect {|i| content_tag('li', 
-        link_to(h("#{i.spent_on.strftime("%Y-%m-%d")} - #{i.project}:  #{l(:label_f_hour_plural, :value => i.hours)}"),
-                { :action => 'edit', :id => i })
-     )}.join("\n").html_safe %>
+<% @time_entries.each do |entry| %>
+  <%= content_tag 'li',
+        link_to("#{format_date(entry.spent_on)} - #{entry.project}: #{l(:label_f_hour_plural, :value => entry.hours)}", edit_time_entry_path(entry)) %>
+<% end %>
 </ul>
 
 <%= form_tag(:action => 'bulk_update') do %>