diff --git a/app/controllers/public/content_viewer_controller.rb b/app/controllers/public/content_viewer_controller.rb
index e6ea205..b77a891 100644
--- a/app/controllers/public/content_viewer_controller.rb
+++ b/app/controllers/public/content_viewer_controller.rb
@@ -46,8 +46,10 @@ class ContentViewerController < ApplicationController
 
     if @version
       @versioned_article = @page.versions.find_by_version(@version)
-      render :template => 'content_viewer/versioned_article.rhtml'
-      return
+      unless @versioned_article == @page.versions.latest
+        render :template => 'content_viewer/versioned_article.rhtml'
+        return
+      end
     end
 
     if request.xhr? && params[:toolbar]
@@ -135,6 +137,11 @@ class ContentViewerController < ApplicationController
     end
   end
 
+#  def article_versions
+#    @page = profile.articles.find(params[:page])
+#    @versions = @page.versions
+#  end
+
   protected
 
   def per_page
diff --git a/app/helpers/article_helper.rb b/app/helpers/article_helper.rb
index c14c3b7..417b41b 100644
--- a/app/helpers/article_helper.rb
+++ b/app/helpers/article_helper.rb
@@ -42,7 +42,15 @@ module ArticleHelper
         'div',
         check_box(:article, :display_hits) +
         content_tag('label', _('I want this article to display the number of hits it received'), :for => 'article_display_hits')
+      ) : '') + 
+
+      (article.can_display_versions? ?
+      content_tag(
+        'div',
+        check_box(:article, :display_versions) +
+        content_tag('label', _('I want this article to display a link to older versions'), :for => 'article_display_versions')
       ) : '')
+
     )
   end
 
diff --git a/app/models/article.rb b/app/models/article.rb
index 908bfb1..72f1a09 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -604,6 +604,16 @@ class Article < ActiveRecord::Base
     false
   end
 
+  settings_items :display_versions, :type => :boolean, :default => false
+
+  def can_display_versions?
+    false
+  end
+
+  def display_versions?
+    can_display_versions? && display_versions
+  end
+
   def author(version_number = nil)
     if version_number
       version = versions.find_by_version(version_number)
diff --git a/app/models/text_article.rb b/app/models/text_article.rb
index a07699e..8c41e04 100644
--- a/app/models/text_article.rb
+++ b/app/models/text_article.rb
@@ -17,4 +17,7 @@ class TextArticle < Article
     end
   end
 
+  def can_display_versions?
+    true
+  end
 end
diff --git a/app/views/content_viewer/_article_versions.rhtml b/app/views/content_viewer/_article_versions.rhtml
index d4339e4..764aafc 100644
--- a/app/views/content_viewer/_article_versions.rhtml
+++ b/app/views/content_viewer/_article_versions.rhtml
@@ -1,5 +1,6 @@
+<h3><%= _('Versions') %></h3>
 <ul class='article-versions'>
   <% @page.versions.each do |v| %>
-    <li><%= link_to("r#{v.version}", @page.url.merge(:rev => v.version)) %></li>
+    <li><%= link_to("#{v.version}", @page.url.merge(:rev => v.version)) %></li>
   <% end %>
 <ul>
diff --git a/app/views/content_viewer/versioned_article.rhtml b/app/views/content_viewer/versioned_article.rhtml
index b441848..b9a306a 100644
--- a/app/views/content_viewer/versioned_article.rhtml
+++ b/app/views/content_viewer/versioned_article.rhtml
@@ -1,5 +1,14 @@
 <div id="article" class="<%= @page.css_class_name %>">
 
+  <% if @page.allow_edit?(user) && !remove_content_button(:edit) %>
+    <div id="article-revert-version">
+      <% content = content_tag('span', _('Revert to this version')) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id, :article => @versioned_article.attributes }) %>
+      <%= expirable_button @page, :edit, content, url %>
+    <% end %>
+
+  </div>
+
   <div id="article-header">
     <h1 class='title'><%= @versioned_article.name %></h1>
     <%= _("Version %{version} - %{author} on %{date}") % {:version => @version, :author => @page.author_name(@version), :date => show_time(@versioned_article.updated_at) } %>
diff --git a/app/views/content_viewer/view_page.rhtml b/app/views/content_viewer/view_page.rhtml
index 3c16b10..2c9c4a5 100644
--- a/app/views/content_viewer/view_page.rhtml
+++ b/app/views/content_viewer/view_page.rhtml
@@ -85,12 +85,15 @@
 </div>
 <% end %>
 
-<div id="article-versions">
-  <%= @page.versions.map {|v| link_to("r#{v.version}", @page.url.merge(:rev => v.version))} %>
-</div>
-
 <%= display_source_info(@page) %>
 
+<% if @page.display_versions? %>
+  <div id="article-versions">
+    <%= render :partial => 'article_versions' %>
+    <%#= button(:clock, _('See older versions'), :controller => 'content_viewer', :profile => profile.identifier, :action => 'article_versions', :page => @page.id) %>
+  </div>
+<% end %>
+
 <div class="comments" id="comments_list">
 
   <% if @page.accept_comments? || @comments_count > 0 %>
diff --git a/public/designs/icons/tango/style.css b/public/designs/icons/tango/style.css
index f0aaf0d..cd3fd99 100644
--- a/public/designs/icons/tango/style.css
+++ b/public/designs/icons/tango/style.css
@@ -104,6 +104,7 @@
 .icon-deactivate-user         { background-image: url(Tango/16x16/emblems/emblem-unreadable.png) }
 .icon-set-admin-role          { background-image: url(mod/16x16/apps/user.png) }
 .icon-reset-admin-role        { background-image: url(/images/icons-app/person-icon.png) }
+.icon-clock        { background-image: url(Tango/16x16/actions/appointment.png) }
 
 /******************LARGE ICONS********************/
 .image-gallery-item .folder  { background-image: url(mod/96x96/places/folder.png) }
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 0e069fa..8754702 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -6539,3 +6539,12 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
   z-index: 1;
 }
 
+ul.article-versions {
+  padding: 0px;
+}
+
+ul.article-versions li {
+  display: inline;
+  font-size: 13px;
+}
+
--
libgit2 0.21.2