diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 24877297f7..d373c02a64 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fixed that UrlHelper#link_to_unless/link_to_if used html_escape on the name if no link was to be applied. This is unnecessary and breaks its use with images #1649 [joergd@pobox.com]
+
 * Added even more goodies to script.aculo.us #1677 [Thomas Fuchs]
   * Added capability to remove draggables/droppables and redeclare sortables in dragdrop.js (this makes it possible to call sortable_element on the same element more than once, e.g. in AJAX returns that modify the sortable element. all current sortable 'stuff' on the element will be discarded and the sortable will be rebuilt)
   * Always reset background color on Effect.Highlight; this make change backwards-compatibility, to be sure include style="background-color:(target-color)" on your elements or else elements will fall back to their CSS rules (which is a good thing in most circumstances)
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 43a2c96226..4864e253a8 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -143,7 +143,7 @@ module ActionView
           if block_given?
             block.arity <= 1 ? yield(name) : yield(name, options, html_options, *parameters_for_method_reference)
           else
-            html_escape(name)
+            name
           end
         else
           link_to(name, options, html_options, *parameters_for_method_reference)