diff --git a/app/models/folder.rb b/app/models/folder.rb
index f288b32..b4c15c5 100644
--- a/app/models/folder.rb
+++ b/app/models/folder.rb
@@ -17,6 +17,7 @@ class Folder < Article
   include ActionView::Helpers::UrlHelper
   include ActionController::UrlWriter
   def to_html
+    content_tag('div', body) +
     content_tag('ul', children.map { |child| content_tag('li', link_to(child.name, child.url)) }, :class => 'folder-listing')
   end
 
diff --git a/app/views/cms/_folder.rhtml b/app/views/cms/_folder.rhtml
index b5d9993..89b274d 100644
--- a/app/views/cms/_folder.rhtml
+++ b/app/views/cms/_folder.rhtml
@@ -1,5 +1,7 @@
 
 <%# TODO add Textile help here %>
+<%= render :file => 'shared/tiny_mce' %>
 
 <%= f.text_field('name', :size => '64') %>
 
+<%= labelled_form_field(_('Description:'), text_area(:article, :body, :cols => 64)) %>
diff --git a/app/views/cms/_textile_article.rhtml b/app/views/cms/_textile_article.rhtml
index e7abb62..a868506 100644
--- a/app/views/cms/_textile_article.rhtml
+++ b/app/views/cms/_textile_article.rhtml
@@ -3,7 +3,5 @@
 
 <%= f.text_field('name', :size => '64') %>
 
-<%= f.text_area('abstract', :cols => 64, :rows => 5) %>
-
 <%= f.text_area('body', :cols => 64) %>
 
diff --git a/app/views/cms/_tiny_mce_article.rhtml b/app/views/cms/_tiny_mce_article.rhtml
index 0a0a855..728c009 100644
--- a/app/views/cms/_tiny_mce_article.rhtml
+++ b/app/views/cms/_tiny_mce_article.rhtml
@@ -3,7 +3,5 @@
 
 <%= f.text_field('name', :size => '64') %>
 
-<%= f.text_area('abstract', :cols => 64, :rows => 5) %>
-
 <%= f.text_area('body', :cols => 64) %>
 
diff --git a/test/unit/folder_test.rb b/test/unit/folder_test.rb
index b4ab4a6..02823a9 100644
--- a/test/unit/folder_test.rb
+++ b/test/unit/folder_test.rb
@@ -30,6 +30,13 @@ class FolderTest < ActiveSupport::TestCase
     assert_match(/<li><a href=".*\/testuser\/f\/otherarticle">otherarticle<\/a><\/li>/, f.to_html)
   end
 
+  should 'show text body in HTML content' do
+    p = create_user('testuser').person
+    f = Folder.create!(:name => 'f', :profile => p, :body => 'this-is-the-text')
+
+    assert_match(/this-is-the-text/, f.to_html)
+  end
+
   should 'identify as folder' do
     assert Folder.new.folder?, 'folder must identity itself as folder'
   end
--
libgit2 0.21.2