diff --git a/app/views/messages/edit.html.erb b/app/views/messages/edit.html.erb
index 3d4b6a4d2..c50bd5dff 100644
--- a/app/views/messages/edit.html.erb
+++ b/app/views/messages/edit.html.erb
@@ -15,7 +15,9 @@
           } do |f| %>
   <%= render :partial => 'form',
              :locals => {:f => f, :replying => !@message.parent.nil?} %>
-  <%= submit_tag l(:button_save) %>
-  <%= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board, :id => @message}, 'message-form') %>
+    <a href="#" onclick="$('#message-form').submit();" class="ButtonColor m3p10">
+      <%= l(:button_save) %>
+    </a>
+    <%= link_to l(:button_cancel), board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id)), :class => "ButtonColor m3p10"  %>
 <% end %>
 <div id="preview" class="wiki"></div>