diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb
index 889e82350..0b0e95b21 100644
--- a/app/views/boards/_course_show.html.erb
+++ b/app/views/boards/_course_show.html.erb
@@ -132,8 +132,8 @@
                           <div class="Msg_txt">
                             <%= link_to_user_header message.author,false,:class => 'fl c_orange ' %>
                             <br/>
-                            <p class="fl break_word"><%= textAreailizable message,:content,:attachments => message.attachments %></p>
-                            <input nhname="nh_content_val" type="hidden" value="<%= message.content %>"/>
+                            <div class="fl break_word"><%= textAreailizable message,:content,:attachments => message.attachments %></div>
+                            <input nhname="nh_content_val" value="<%= message.content %>" type="hidden"/>
                             <br/>
                             <span class=" c_grey fl"><%= format_time(message.created_on) %></span>
                             <%= link_to(
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 48b3d6ccf..a8dc4ad1a 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -120,7 +120,7 @@
                   <div class="Msg_txt">
                     <%= link_to_user_header message.author,false,:class => 'fl c_orange ' %>
                     <br/>
-                    <p class="fl break_word"><%= textAreailizable message,:content,:attachments => message.attachments %></p>
+                    <div class="fl break_word"><%= textAreailizable message,:content,:attachments => message.attachments %></div>
                     <input nhname="nh_content_val" type="hidden" value="<%= message.content %>"/>
                     <br/>
                     <span class=" c_grey fl"><%= format_time(message.created_on) %></span>
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index 8bc4cc7af..69300ec4b 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -1,7 +1,10 @@
 <style>
-    .ke-toolbar-icon-url{background-image:url( '/assets/kindeditor/plugins/emoticons/images/0.gif' )}
-    .ke-toolbar{display:none;width:400px;border:none;background:none;}
-    .ke-icon-emoticons{background-position:0px 0px;width:24px;height:24px;}
+    .ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
+    .ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
+    .ke-toolbar-icon-url{background-image:url( '/images/public_icon.png' )}
+    .ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
+    .ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
+    .ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
     .ke-toolbar .ke-outline{border:none;}
 </style>
 <script type="text/javascript">
@@ -128,7 +131,7 @@ function nh_init_board(params){
                 },
                 afterCreate:function(){
                     var toolbar = $("div[class='ke-toolbar']",params.about_talk);
-                    toolbar.append('<span style="line-height:24px;">表情</span>');
+                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
                     params.toolbar_container.append(toolbar);
                 }
             });
@@ -168,7 +171,7 @@ function nh_init_board(params){
                     }else{
                         params.textarea.html(params.init_content_val.val());
                     }
-                    editor.html(params.textarea.html());
+                    editor.valueOf(params.textarea);
                     params.subjectmsg.hide();
                     params.contentmsg.hide();
                     if(params.quote_show!=undefined)params.quote_show.empty();
diff --git a/public/images/public_icon.png b/public/images/public_icon.png
index 68be31f5d..1fa463e4e 100644
Binary files a/public/images/public_icon.png and b/public/images/public_icon.png differ