diff --git a/app/controllers/public/content_viewer_controller.rb b/app/controllers/public/content_viewer_controller.rb
index 5be5dbf..0a910b4 100644
--- a/app/controllers/public/content_viewer_controller.rb
+++ b/app/controllers/public/content_viewer_controller.rb
@@ -127,7 +127,7 @@ class ContentViewerController < ApplicationController
   def versions_diff
     path = params[:page].join('/')
     @page = profile.articles.find_by_path(path)
-    @v1, @v2 = @page.versions.find_by_version(params[:v1]).body, @page.versions.find_by_version(params[:v2]).body
+    @v1, @v2 = @page.versions.find_by_version(params[:v1]), @page.versions.find_by_version(params[:v2])
     p params
   end
 
diff --git a/app/views/content_viewer/article_versions.rhtml b/app/views/content_viewer/article_versions.rhtml
index 56ef20f..055b439 100644
--- a/app/views/content_viewer/article_versions.rhtml
+++ b/app/views/content_viewer/article_versions.rhtml
@@ -2,20 +2,54 @@
 
 <p><%= _('This is the list of all versions of this content. Select a version to see it and then revert to it.') %>.</p>
 
-<% form_tag({:controller => 'content_viewer', :action => 'versions_diff', :profile => profile.identifier, :page => @page.path.split('/')}) do %>
-  <ul class='article-versions'>
+<% form_tag({:controller => 'content_viewer', :action => 'versions_diff', :profile => profile.identifier, :page => @page.path.split('/')}, :method => 'get') do %>
+  <ul id="article-versions">
     <% @versions.each do |v| %>
-      <li> 
-        <%= radio_button_tag 'v1', v.version %> 
-        <%= radio_button_tag 'v2', v.version %>
+      <li>
+        <%= radio_button_tag 'v1', v.version, false, :onclick => 'versionInputClicked(this)' %>
+        <%= radio_button_tag 'v2', v.version, false, :onclick => 'versionInputClicked(this)' %>
         <%= link_to(_("Version #{v.version}"), @page.url.merge(:version => v.version)) %>
         <%= @page.version == v.version ? _('(current)') : '' %>
         <span class='updated-by'><%= _('by %{author}') % {:author => link_to(@page.author_name(v.version), @page.author_url)} %></span>
-        <div class='updated-on'><%= show_time(v.updated_at) %></div>
+        <span class='updated-on'><%= show_time(v.updated_at) %></span>
       </li>
     <% end %>
   </ul>
 
-  <%= submit_button(:search, _('Show differences between selected versions')) %>
+<script>
+  function versionInputClicked(input) {
+    var selectedColumn = input.name;
+    var sisterColumn = (selectedColumn == 'v1') ? 'v2' : 'v1';
+    var li = input.parentNode;
+    var checkedBrotherLi = jQuery('#article-versions input[name=' + sisterColumn + ']:checked').parent()[0];
+    updateColumn(selectedColumn, li);
+    updateColumn(sisterColumn, checkedBrotherLi); 
+  }
+
+  function updateColumn(selectedColumn, startLi){
+    var sisterColumn = (selectedColumn == 'v1') ? 'v2' : 'v1';
+    var walkMethod = (selectedColumn == 'v1') ? 'prev' : 'next';
+    var li = startLi;
+    var foundCheckedBrother = false;
+    while(li = jQuery(li)[walkMethod]()[0]) {
+      li.className = '';
+      if (!foundCheckedBrother){
+        li.className = 'selected';
+        foundCheckedBrother = jQuery('input[name=' + sisterColumn + ']', li)[0].checked;
+      }
+      jQuery('input[name=' + selectedColumn + ']', li)[0].disabled = foundCheckedBrother;
+    }
+  }
+
+  var penultVersion = jQuery('#article-versions input[name=v1]')[1];
+  var lastVersion = jQuery('#article-versions input[name=v2]')[0];
+  jQuery('#article-versions input').attr('disabled', false);
+  if (penultVersion && lastVersion) {
+    penultVersion.checked = lastVersion.checked = true;
+    lastVersion.onclick();
+  }
+</script> 
+  <%= submit_button(:clock, _('Show differences between selected versions')) %>
 <% end %>
 <%= pagination_links @versions, :param_name => 'npage' %>
+
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 32b2e76..0ce6d00 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -6539,7 +6539,71 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
   z-index: 1;
 }
 
-ul.article-versions li {
-  font-size: 13px;
+#article-versions {
+  margin: 0 0 15px 0;
+  padding: 0;
+}
+
+#article-versions li {
+  list-style: none;
+  margin: 0;
   padding: 3px 0px;
 }
+
+#article-versions input:disabled {
+  opacity: 0.3;
+}
+
+#article-versions .selected {
+  background: #ff9;
+}
+
+.action-content_viewer-versions_diff .diff {
+  text-align: justify;
+}
+
+.diff ul {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+
+.diff del, .diff ins {
+  display: block;
+  text-decoration: none;
+}
+
+.diff li {
+  padding: 5px 10px; 
+  margin: 0;
+  line-height: 150%;
+}
+
+.diff li.ins {
+  background: #dfd;
+}
+
+.diff li.del {
+  background: #fee;
+}
+
+.diff li.ins:hover {
+  background: #8f8;
+}
+
+.diff li.del:hover {
+  background: #f99;
+}
+
+.diff strong {
+  background: rgba(255, 255, 0, 0.2);
+}
+
+.diff li.diff-comment { 
+  display: none; 
+}
+
+.diff li.diff-block-info { 
+  background: none repeat scroll 0 0 gray;
+}
+
--
libgit2 0.21.2