diff --git a/redmine/app/views/documents/_form.rhtml b/redmine/app/views/documents/_form.rhtml
index 724bcbaa22..873c963299 100644
--- a/redmine/app/views/documents/_form.rhtml
+++ b/redmine/app/views/documents/_form.rhtml
@@ -10,6 +10,20 @@
 <%= text_field 'document', 'title', :size => 60 %></p>
 
 <p><label for="document_description"><%=l(:field_description)%></label>
-<%= text_area 'document', 'description', :cols => 60, :rows => 5 %></p>
+<%= text_area 'document', 'description', :cols => 60, :rows => 15 %></p>
 <!--[eoform:document]-->
-</div>
\ No newline at end of file
+</div>
+
+<% unless $RDM_TEXTILE_DISABLED %>
+<%= javascript_include_tag 'jstoolbar' %>
+<script type="text/javascript">
+//<![CDATA[
+if (document.getElementById) { 
+	if (document.getElementById('document_description')) { 
+		var commentTb = new jsToolBar(document.getElementById('document_description')); 
+		commentTb.draw(); 
+	}
+}
+//]]>
+</script>
+<% end %>
\ No newline at end of file
diff --git a/redmine/app/views/documents/show.rhtml b/redmine/app/views/documents/show.rhtml
index 2b8da670f3..c6dbbe9576 100644
--- a/redmine/app/views/documents/show.rhtml
+++ b/redmine/app/views/documents/show.rhtml
@@ -1,47 +1,48 @@
 <h2><%= @document.title %></h2>
 
-<strong><%=l(:field_description)%>:</strong> <%= @document.description %><br />
-<strong><%=l(:field_category)%>:</strong> <%= @document.category.name %><br />
-<br />
+<p><em><%= @document.category.name %><br />
+<%= format_date @document.created_on %></em></p>
+<%= textilizable @document.description %>
 
-<% if authorize_for('documents', 'edit') %>
-  <%= start_form_tag({ :controller => 'documents', :action => 'edit', :id => @document }, :method => 'get' ) %>
-  <%= submit_tag l(:button_edit) %>
-  <%= end_form_tag %> 
-<% end %>
 
+<table width="100%">
+<tr><td><%= link_to_if_authorized l(:button_edit), :controller => 'documents', :action => 'edit', :id => @document %></td>
+<td align="right">
 <% if authorize_for('documents', 'destroy') %>
   <%= start_form_tag({ :controller => 'documents', :action => 'destroy', :id => @document } ) %>
   <%= submit_tag l(:button_delete) %>
-  <%= end_form_tag %>  
+  <%= end_form_tag %>
 <% end %>
+</td></tr>
+</table>
+<br />
 
-<br /><br />
-
-<table class="reportTableContent">  
+<h3><%= l(:label_attachment_plural) %></h3>
+<ul>  
 <% for attachment in @attachments %>
-  <tr class="<%= cycle("odd", "even") %>">
-  <td><%= format_date(attachment.created_on) %></td>
-  <td><%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %></td>
-  <td align="center"><%= attachment.author.display_name %></td>
-  <td><%= human_size(attachment.filesize) %><br /><%= lwr(:label_download, attachment.downloads) %></td>
-  
-  <% if authorize_for('documents', 'destroy_attachment') %>
-  <td align="center">
-    <%= start_form_tag :action => 'destroy_attachment', :id => @document, :attachment_id => attachment %>
-    <%= submit_tag l(:button_delete), :class => "button-small" %>
-    <%= end_form_tag %>
-  </tr>
-  <% end %>
-  
+    <li>
+        <% if authorize_for('documents', 'destroy') %>
+        <div style="float:right;padding:6px;">
+        <%= start_form_tag({ :controller => 'documents', :action => 'destroy', :id => @document } ) %>
+        <%= submit_tag l(:button_delete), :class => 'button-small' %>
+         <%= end_form_tag %>
+         </div>
+         <% end %>
+
+        <%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %>
+        (<%= human_size attachment.filesize %>)<br />
+        <em><%= attachment.author.display_name %>, <%= format_date(attachment.created_on) %></em><br />
+        <%= lwr(:label_download, attachment.downloads) %>
+    </li>
 <% end %>
-</table>
+</ul>
 <br />
 
+
 <% if authorize_for('documents', 'add_attachment') %>
   <%= start_form_tag ({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true) %>
-  <%=l(:label_attachment_new)%><br /><%= file_field 'attachment', 'file'  %>
+  <label><%=l(:label_attachment_new)%></label>&nbsp;&nbsp;
+  <%= file_field 'attachment', 'file'  %>
   <%= submit_tag l(:button_add) %>
   <%= end_form_tag %> 
 <% end %>
-
diff --git a/redmine/app/views/projects/list_documents.rhtml b/redmine/app/views/projects/list_documents.rhtml
index e47abceb3e..9bbadc4767 100644
--- a/redmine/app/views/projects/list_documents.rhtml
+++ b/redmine/app/views/projects/list_documents.rhtml
@@ -10,8 +10,8 @@
   <li>
     <b><%= link_to d.title, :controller => 'documents', :action => 'show', :id => d %></b>
     <br />
-    <%=l(:field_description)%>: <%= d.description %><br />
-    <%= format_time(d.created_on) %>    
+    <%= truncate d.description, 250 %><br />
+    <em><%= format_time(d.created_on) %></em>
   </li>		
 
 <% end %>