diff --git a/app/views/attachments/diff.html.erb b/app/views/attachments/diff.html.erb
index d125f82fd..5f5f4d7eb 100644
--- a/app/views/attachments/diff.html.erb
+++ b/app/views/attachments/diff.html.erb
@@ -1,11 +1,4 @@
-<h2><%=h @attachment.filename %></h2>
-
-<div class="attachments">
-<p><%= "#{@attachment.description} - " unless @attachment.description.blank? %>
-   <span class="author"><%= link_to_user(@attachment.author) %>, <%= format_time(@attachment.created_on) %></span></p>
-<p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
-   <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span></p>
-</div>
+<%= render :layout => 'layouts/file' do %>
 <%= form_tag({}, :method => 'get') do %>
   <p>
     <%= l(:label_view_diff) %>:
@@ -14,9 +7,4 @@
   </p>
 <% end %>
 <%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type, :diff_style => nil} %>
-
-<% html_title @attachment.filename %>
-
-<% content_for :header_tags do -%>
-    <%= stylesheet_link_tag "scm" -%>
-<% end -%>
+<% end %>
diff --git a/app/views/attachments/file.html.erb b/app/views/attachments/file.html.erb
index e507ab648..e69124923 100644
--- a/app/views/attachments/file.html.erb
+++ b/app/views/attachments/file.html.erb
@@ -1,17 +1,4 @@
-<h2><%=h @attachment.filename %></h2>
-
-<div class="attachments">
-<p><%= "#{@attachment.description} - " unless @attachment.description.blank? %>
-   <span class="author"><%= link_to_user(@attachment.author) %>, <%= format_time(@attachment.created_on) %></span></p>
-<p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
-   <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span></p>
-
-</div>
+<%= render :layout => 'layouts/file' do %>
 &nbsp;
 <%= render :partial => 'common/file', :locals => {:content => @content, :filename => @attachment.filename} %>
-
-<% html_title @attachment.filename %>
-
-<% content_for :header_tags do -%>
-    <%= stylesheet_link_tag "scm" -%>
-<% end -%>
+<% end %>
diff --git a/app/views/layouts/_file.html.erb b/app/views/layouts/_file.html.erb
new file mode 100644
index 000000000..7bb939a4c
--- /dev/null
+++ b/app/views/layouts/_file.html.erb
@@ -0,0 +1,15 @@
+<h2><%=h @attachment.filename %></h2>
+
+<div class="attachments">
+<p><%= "#{@attachment.description} - " unless @attachment.description.blank? %>
+   <span class="author"><%= link_to_user(@attachment.author) %>, <%= format_time(@attachment.created_on) %></span></p>
+<p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
+   <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span></p>
+</div>
+<%= yield %>
+
+<% html_title @attachment.filename %>
+
+<% content_for :header_tags do -%>
+    <%= stylesheet_link_tag "scm" -%>
+<% end -%>