diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 8d31a0431..34a3e4190 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -8,10 +8,12 @@
             :onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' if User.current.logged? %> -->
 <!-- <%= watcher_link(@board, User.current) %> -->
 <!-- </div> -->
-
 <div id="add-message" class="add_frame" style="display:none;">
 <% if User.current.logged? %>
 <h3><%= link_to h(@board.name), project_board_path(@project, @board) %> &#187; <%= l(:label_message_new) %></h3>
+<div class="add_frame_header" >
+  <%= l(:label_message_new) %>
+</div>
 <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %>
   <%= render :partial => 'messages/form', :locals => {:f => f} %>
   <p><%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
diff --git a/app/views/messages/_form.html.erb b/app/views/messages/_form.html.erb
index 2ed830ceb..04940dbdc 100644
--- a/app/views/messages/_form.html.erb
+++ b/app/views/messages/_form.html.erb
@@ -1,7 +1,4 @@
 <%= error_messages_for 'message' %>
-<div class="add_frame_header" >
-	<%= l(:label_message_new) %>
-</div>
 <% replying ||= false %>
 
 <div class="box ph10_5">
diff --git a/app/views/messages/new.html.erb b/app/views/messages/new.html.erb
index f2137b989..f02af1daa 100644
--- a/app/views/messages/new.html.erb
+++ b/app/views/messages/new.html.erb
@@ -1,9 +1,9 @@
-<h3><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%= l(:label_message_new) %></h3>
-
-<%= form_for @message, :url => {:action => 'new'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
-  <%= render :partial => 'form', :locals => {:f => f} %>
-  <%= submit_tag l(:button_create) %>
-  <%= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form') %>
-<% end %>
-
-<div id="preview" class="wiki"></div>
+<h3><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%= l(:label_message_new) %></h3>
+
+<%= form_for @message, :url => {:action => 'new'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
+  <%= render :partial => 'form', :locals => {:f => f} %>
+  <%= submit_tag l(:button_create), :class => "whiteButton m3p10 h30" %>
+  <%= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form' ,target='preview',{:class => 'whiteButton m3p10'} )%>
+<% end %>
+
+<div id="preview" class="wiki"></div>
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 9e6e5e659..fae3c4c38 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -35,6 +35,9 @@
 	margin: 1%;
 	margin-bottom: 40px;
 	background-color: #F6F6F6;
+  white-space: normal;
+  /*word-break: break-all;   */
+  word-wrap: break-word;
 }
 .memo-timestamp{
   position: absolute;