Index: templates/wiki.cs
===================================================================
--- templates/wiki.cs	(revision 3423)
+++ templates/wiki.cs	(working copy)
@@ -12,20 +12,8 @@
      else ?>
       <span class="missing">&larr; Previous Change</span><?cs
      /if ?>
-   </li><?cs
-   set:history_class = "" ?><?cs 
-  else ?>
-   <li><a href="<?cs var:trac.href.wiki ?>">Start Page</a></li>
-   <li><a href="<?cs var:trac.href.wiki ?>/TitleIndex">Title Index</a></li>
-   <li><a href="<?cs var:trac.href.wiki ?>/RecentChanges">Recent Changes</a></li><?cs
-   set:history_class = "last" ?><?cs
-  /if ?><?cs
-  if:wiki.history_href ?>
-   <li class="<?cs var:history_class ?>"><a href="<?cs var:wiki.history_href ?>">Page History</a></li><?cs 
-  else ?>
-   <li class="<?cs var:history_class ?>">Page History</li><?cs 
-  /if ?><?cs
-  if:wiki.action == "diff" ?>
+   </li>
+   <li><a href="<?cs var:wiki.history_href ?>">Page History</a></li>
    <li class="last"><?cs
      if:len(chrome.links.next) ?>
       <a class="next" href="<?cs var:chrome.links.next.0.href ?>" title="<?cs
@@ -33,7 +21,14 @@
      else ?>
       <span class="missing">Next Change &rarr;</span><?cs
      /if ?>
-   </li><?cs 
+   </li><?cs
+  elif:wiki.action == "history" ?>
+   <li><a href="<?cs var:wiki.current_href ?>">View Latest Version</a></li><?cs
+  else ?>
+   <li><a href="<?cs var:trac.href.wiki ?>">Start Page</a></li>
+   <li><a href="<?cs var:trac.href.wiki ?>/TitleIndex">Index by Title</a></li>
+   <li><a href="<?cs var:trac.href.wiki ?>/RecentChanges">Index by Date</a></li>
+   <li class="last"><a href="<?cs var:wiki.last_change_href ?>">Last Change</a></li><?cs 
   /if ?>
  </ul>
  <hr />
Index: trac/wiki/web_ui.py
===================================================================
--- trac/wiki/web_ui.py	(revision 3423)
+++ trac/wiki/web_ui.py	(working copy)
@@ -360,7 +365,10 @@
         }
         if page.exists:
             info['history_href'] = req.href.wiki(page.name,
-                                                      action='history')
+                                                 action='history')
+            info['last_change_href'] = req.href.wiki(page.name,
+                                                     action='diff',
+                                                     version=page.version)
         if preview:
             info['page_html'] = wiki_to_html(page.text, self.env, req, db)
             info['readonly'] = int(req.args.has_key('readonly'))
@@ -420,9 +428,12 @@
         req.hdf['wiki'] = {'exists': page.exists,
                            'version': page.version, 'readonly': page.readonly}
         if page.exists:
-            req.hdf['wiki.page_html'] = wiki_to_html(page.text, self.env, req)
-            history_href = req.href.wiki(page.name, action='history')
-            req.hdf['wiki.history_href'] = history_href
+            req.hdf['wiki'] = {
+                'page_html': wiki_to_html(page.text, self.env, req),
+                'history_href': req.href.wiki(page.name, action='history'),
+                'last_change_href': req.href.wiki(page.name, action='diff',
+                                                  version=page.version)
+                }
         else:
             if not req.perm.has_permission('WIKI_CREATE'):
                 raise HTTPNotFound('Page %s not found', page.name)