--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -99,7 +99,7 @@ module BrowseHelper
   end
   
   def render_diffmode_selector
-    out = %Q{<ul class="diffmode_selector">}
+    out = %Q{<ul class="mode_selector">}
     out << %Q{<li class="list_header">Diff rendering mode:</li>}
     if @diffmode == "sidebyside"
       out << %Q{<li><a href="?diffmode=inline">inline</a></li>}

--- a/app/views/browse/blob.html.erb
+++ b/app/views/browse/blob.html.erb
@@ -1,8 +1,19 @@
 <% @page_title = "#{current_path.join("/")} - #{@repository.name} in #{@project.title}" -%>
+
+<ul class="mode_selector">
+  <li class="list_header">
+    Softwrap mode:
+  </li>
+  <li>
+    <%= link_to_function "Toggle", "Gitorious.Wordwrapper.toggle($$('table#codeblob td.code'))" -%>
+  </li>
+</ul>
+
 <h1>
   Blob of <code><%= current_path.join("/") -%></code> 
   <small>(<%= link_to "raw blob data", raw_blob_path(@blob.sha, current_path) -%>)</small>
 </h1>
+
 <pre><%= with_line_numbers{ h(@blob.contents) } -%></pre>
 
 <%= render :partial => "submenu" -%>

--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -74,6 +74,14 @@ var Gitorious = {
         //e.removeClassName("softwrapped");
         e.addClassName("unwrapped");
       });
+    },
+    
+    toggle: function(elements) {
+      if (/unwrapped/.test(elements.first().className)) {
+        Gitorious.Wordwrapper.wrap(elements);
+      } else {
+        Gitorious.Wordwrapper.unwrap(elements);
+      }
     }
   }
 };

--- a/public/stylesheets/base.css
+++ b/public/stylesheets/base.css
@@ -600,13 +600,13 @@ div.comment p.byline {
 }
 
 /* diff mode selector */
-ul.diffmode_selector { float: right; }
-ul.diffmode_selector li {
+ul.mode_selector { float: right;}
+ul.mode_selector li {
   display:inline;
   margin-left: 1em;
 }
-ul.diffmode_selector li.list_header { font-weight: bold; }
-ul.diffmode_selector li.selected    { border-bottom: 1px solid #666; }
+ul.mode_selector li.list_header { font-weight: bold; }
+ul.mode_selector li.selected    { border-bottom: 1px solid #666; }
 
 /* Diff rendering */ 
 

--- a/spec/helpers/browse_helper_spec.rb
+++ b/spec/helpers/browse_helper_spec.rb
@@ -83,7 +83,7 @@ describe BrowseHelper do
   
     it "doesn't blow up when with_line_numbers receives nil" do
       proc{
-        with_line_numbers{ nil }.should == "<table>\n</table>"
+        with_line_numbers{ nil }.should == "<table id=\"codeblob\">\n</table>"
       }.should_not raise_error
     end
   end