diff --git a/app/views/boards/show.rhtml b/app/views/boards/show.rhtml
index cdb9e77..0af89fd 100644
--- a/app/views/boards/show.rhtml
+++ b/app/views/boards/show.rhtml
@@ -1,8 +1,20 @@
-<%= link_to_if_authorized l(:label_message_new), {:controller => 'messages', :action => 'new', :board_id => @board}, :class => "icon icon-add" %>
+<%= link_to_if_authorized l(:label_message_new),
+ {:controller => 'messages', :action => 'new', :board_id => @board},
+ :class => 'icon icon-add',
+ :onclick => 'Element.show("add-message"); return false;' %>
<%= watcher_tag(@board, User.current) %>
+
+
<%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> » <%= l(:label_message_new) %>
+<% form_for :message, @message, :url => {:controller => 'messages', :action => 'new', :board_id => @board}, :html => {:multipart => true} do |f| %>
+ <%= render :partial => 'messages/form', :locals => {:f => f} %>
+
<%= submit_tag l(:button_create) %>
+ <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-message")' %>
+<% end %>
+
+
<%=h @board.name %>
<% if @topics.any? %>
diff --git a/app/views/messages/_form.rhtml b/app/views/messages/_form.rhtml
index 0d1ec73..e484baf 100644
--- a/app/views/messages/_form.rhtml
+++ b/app/views/messages/_form.rhtml
@@ -3,7 +3,7 @@
-<%= f.text_field :subject, :required => true, :size => 80 %>
+<%= f.text_field :subject, :required => true, :size => 120 %>
<%= f.text_area :content, :required => true, :cols => 80, :rows => 15, :class => 'wiki-edit' %>
<%= wikitoolbar_for 'message_content' %>
diff --git a/app/views/messages/show.rhtml b/app/views/messages/show.rhtml
index 3e546ce..772f065 100644
--- a/app/views/messages/show.rhtml
+++ b/app/views/messages/show.rhtml
@@ -1,16 +1,17 @@
<%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> » <%=h @message.subject %>
-
<%= @message.author.name %>, <%= format_time(@message.created_on) %>
+
<%= authoring @message.created_on, @message.author %>
<%= textilizable(@message.content, :attachments => @message.attachments) %>
<%= link_to_attachments @message.attachments, :no_author => true %>
+
<% @message.children.each do |message| %>
">
<%=h message.subject %> - <%= message.author.name %>, <%= format_time(message.created_on) %>
-
<%= textilizable message.content %>
+
<%= textilizable message.content %>
<% end %>
<% if authorize_for('messages', 'reply') %>