diff --git a/rhodecode/templates/files/file_diff.html b/rhodecode/templates/files/file_diff.html
--- a/rhodecode/templates/files/file_diff.html
+++ b/rhodecode/templates/files/file_diff.html
@@ -9,7 +9,7 @@
     »
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     »
-    ${'%s:  %s %s %s' % (_('File diff'),c.diff2,'→',c.diff1)|n}
+    ${_('File diff')} r${c.changeset_1.revision}:${h.short_id(c.changeset_1.raw_id)} → r${c.changeset_2.revision}:${h.short_id(c.changeset_2.raw_id)}
 </%def>
 
 <%def name="page_nav()">
@@ -26,13 +26,13 @@
 			<div class="code-header">
 				<div>
 				<span>${h.link_to(c.f_path,h.url('files_home',repo_name=c.repo_name,
-				revision=c.diff2.split(':')[1],f_path=c.f_path))}</span>
+				revision=c.changeset_2.raw_id,f_path=c.f_path))}</span>
 				 &raquo; <span>${h.link_to(_('diff'),
-				h.url.current(diff2=c.diff2.split(':')[-1],diff1=c.diff1.split(':')[-1],diff='diff'))}</span>
+				h.url.current(diff2=c.changeset_2.raw_id,diff1=c.changeset_1.raw_id,diff='diff'))}</span>
 				 &raquo; <span>${h.link_to(_('raw diff'),
-				h.url.current(diff2=c.diff2.split(':')[-1],diff1=c.diff1.split(':')[-1],diff='raw'))}</span>
+				h.url.current(diff2=c.changeset_2.raw_id,diff1=c.changeset_1.raw_id,diff='raw'))}</span>
 				 &raquo; <span>${h.link_to(_('download diff'),
-				h.url.current(diff2=c.diff2.split(':')[-1],diff1=c.diff1.split(':')[-1],diff='download'))}</span>
+				h.url.current(diff2=c.changeset_2.raw_id,diff1=c.changeset_1.raw_id,diff='download'))}</span>
 				</div>
 			</div>
 			<div class="code-body">