diff --git a/pynuts/document.py b/pynuts/document.py
index 40865e3..5cd1e73 100644
--- a/pynuts/document.py
+++ b/pynuts/document.py
@@ -247,7 +247,9 @@ def edit(cls, template, part='index.rst.jinja2', version=None,
             document.git.tree.add(part, 0100644, blob_id)
             document.git.store.add_object(document.git.tree)
             if message is None:
-                message = 'Edit %s' % document.document_id
+                message = (
+                    request.form.get('message') or
+                    'Edit %s' % document.document_id)
             commit_id = document.git.store_commit(
                 document.git.tree.id, [document.git.commit.id], 'Pynuts',
                 message)
diff --git a/pynuts/templates/edit_document.jinja2 b/pynuts/templates/edit_document.jinja2
index b92bd5a..74a7e02 100644
--- a/pynuts/templates/edit_document.jinja2
+++ b/pynuts/templates/edit_document.jinja2
@@ -1,5 +1,8 @@
 <form action="" method="post">
   <input type="hidden" value="{{ old_commit }}" name="_old_commit" />
-  <textarea name="document" cols="100" rows="20">{{ text }}</textarea>
-  <input type=submit value="Save">
+  <label for="document">Content</label>
+  <textarea name="document" id="message">{{ text }}</textarea>
+  <label for="message">Message</label>
+  <input type="text" name="message" id="message" />
+  <input type="text" value="Save">
 </form>