diff --git a/app/views/diary_entry/edit.html.erb b/app/views/diary_entry/edit.html.erb
index da409e61a..6b4d9c177 100644
--- a/app/views/diary_entry/edit.html.erb
+++ b/app/views/diary_entry/edit.html.erb
@@ -10,7 +10,7 @@
     </tr>
     <tr valign="top">
       <td class="fieldName"><%= t 'diary_entry.edit.body' -%></td>
-      <td><%= richtext_area :diary_entry, :body, :cols => 80 %></td>
+      <td><%= richtext_area :diary_entry, :body, :cols => 80, :format => @diary_entry.body_format %></td>
     </tr>
     <tr valign="top">
       <td class="fieldName"><%= t 'diary_entry.edit.language' -%></td>
diff --git a/app/views/site/_html_help.erb b/app/views/site/_html_help.erb
new file mode 100644
index 000000000..e69de29bb