diff --git a/app/views/documents/show.rhtml b/app/views/documents/show.rhtml
index 599ac389b..3014387bd 100644
--- a/app/views/documents/show.rhtml
+++ b/app/views/documents/show.rhtml
@@ -7,7 +7,9 @@
<%=h @document.category.name %>
<%= format_date @document.created_on %>
+
<%= textilizable @document.description, :attachments => @document.attachments %>
+
<%= l(:label_attachment_plural) %>
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index 006efa3d5..91b638216 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -64,7 +64,9 @@ end %>
<% end %>
<%=l(:field_description)%>
+
<%= textilizable @issue, :description, :attachments => @issue.attachments %>
+
<% if @issue.attachments.any? %>
<%= link_to_attachments @issue.attachments, :delete_url => (authorize_for('issues', 'destroy_attachment') ? {:controller => 'issues', :action => 'destroy_attachment', :id => @issue} : nil) %>