diff --git a/app/views/diary_entry/new.rhtml b/app/views/diary_entry/new.rhtml
index c0ddaef23..16974fad2 100644
--- a/app/views/diary_entry/new.rhtml
+++ b/app/views/diary_entry/new.rhtml
@@ -1,6 +1,6 @@
 <%= error_messages_for 'diary_entry' %>
 
-<% form_for :controller => 'diary_entry', :action => 'new' do |f| %>
+<% form_for :diary_entry do |f| %>
   <table>
     <tr valign="top">
       <th>Subject</th>
diff --git a/app/views/message/new.rhtml b/app/views/message/new.rhtml
index b2d31b842..44ef84dfc 100644
--- a/app/views/message/new.rhtml
+++ b/app/views/message/new.rhtml
@@ -9,10 +9,21 @@
 
 <%= error_messages_for 'message' %>
 
-<% form_tag :controller => 'message', :action => 'new' do %>
-subject: <%= text_field 'message', 'title' %><br>
-body: <%= text_area 'message', 'body' %><br>
-  <%= submit_tag 'Send' %>
+<% form_for :message do |f| %>
+  <table>
+    <tr valign="top">
+      <th>Subject</th>
+      <td><%= f.text_field :title, :size => 60 %></td>
+    </tr>
+    <tr valign="top">
+      <th>Body</th>
+      <td><%= f.text_area :body, :cols => 80 %></td>
+    </tr>
+    <tr>
+      <th></th>
+      <td><%= f.submit_tag 'Send' %></td>
+    </tr>
+  </table>
 <% end %>
 
 <br />