diff --git a/pylons_app/templates/files/file_diff.html b/pylons_app/templates/files/file_diff.html
--- a/pylons_app/templates/files/file_diff.html
+++ b/pylons_app/templates/files/file_diff.html
@@ -28,13 +28,22 @@
     <h2 class="no-link no-border">${'%s:  %s %s %s' % (_('File diff'),c.diff2,'&rarr;',c.diff1)|n}</h2>
 <div id="body" class="diffblock">
 	<div class="code-header">
-		<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>
+		<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>
+		 &raquo; <span style="font-size:77%">${h.link_to(_('diff'),
+		h.url.current(diff2=c.diff2.split(':')[-1],diff1=c.diff1.split(':')[-1],diff='diff'))}</span>
+		 &raquo; <span style="font-size:77%">${h.link_to(_('raw diff'),
+		h.url.current(diff2=c.diff2.split(':')[-1],diff1=c.diff1.split(':')[-1],diff='raw'))}</span>
+		 &raquo; <span style="font-size:77%">${h.link_to(_('download diff'),
+		h.url.current(diff2=c.diff2.split(':')[-1],diff1=c.diff1.split(':')[-1],diff='download'))}</span>
+		</div>
 	</div>
 	<div class="code-body">
  			%if c.no_changes:
             	${_('No changes')}
             %else:        
-				${c.differ.as_HTML()|n}
+				${c.cur_diff|n}
             %endif
 	</div>
 </div>