diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index f9b96d7cc..e0567004a 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -83,8 +83,9 @@
                       <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
                       <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %></span></li>
                       <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                        <%=link_to ma.course_message.subject.html_safe, course_boards_path(ma.course_message.course,:parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id,
-                                                                                           :topic_id => ma.course_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}",
+                        <%= link_to ma.course_message.parent_id.nil? ? ma.course_message.subject.html_safe : ma.course_message.content.html_safe,
+                                    course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),
+                                    :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
                                    :title => "#{ma.course_message.subject.html_safe}" %></a></li>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
 
@@ -152,7 +153,7 @@
                       <li class="homepageNewsPubType fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
                         <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %></span></li>
                       <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                        <%=link_to ma.forge_message.subject.html_safe, project_boards_path(ma.forge_message.project,
+                        <%=link_to ma.forge_message.parent_id.nil? ? ma.forge_message.subject.html_safe : ma.forge_message.content.html_safe, project_boards_path(ma.forge_message.project,
                                                                                            :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id,
                                                                                            :topic_id => ma.forge_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}",
                                    :title => "#{ma.forge_message.subject.html_safe}" %></a></li>
diff --git a/public/javascripts/project.js b/public/javascripts/project.js
index c7a615ba3..a09484fd5 100644
--- a/public/javascripts/project.js
+++ b/public/javascripts/project.js
@@ -248,6 +248,13 @@ function regexDescription() {
         $("#description_notice_span").focus();
         return false;
     }
+    else if (name.length > 10000)
+    {
+        $("#description_notice_span").text("描述超过10000个字符");
+        $("#description_notice_span").css('color', '#ff0000');
+        $("#description_notice_span").focus();
+        return false;
+    }
     else {
         $("#description_notice_span").text("填写正确");
         $("#description_notice_span").css('color', '#008000');
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 8d86a6873..a22831b2c 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -507,7 +507,7 @@ img.ui-datepicker-trigger {
 .wiki_new_ul input{ height:26px; margin-bottom:10px;}
 .wiki_con_tit{ font-size:14px; color:#09658c; font-weight:bold;width:630px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; margin-bottom:10px;}
 .wiki_con_box{ line-height:1.9; color:#2d2d2d;}
-.wiki_page_con{ border-bottom:1px dashed #CCC; margin-bottom:10px; padding-bottom:10px;}
+.wiki_page_con{ border-bottom:1px dashed #CCC; margin-bottom:10px; padding-bottom:10px; word-wrap:break-word; word-break:break-all}
 .wiki_page p{word-break: break-all;word-wrap: break-word;}
 #wiki_new_box{ display:none;}
 /*wiki显示附加*/