diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index f6b083b4d..2935d018a 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -68,8 +68,14 @@ module UsersHelper
         '课程讨论'
       when 'course_news'
         '课程通知'
+      when 'poll'
+        '课程问卷'
       when 'issue'
         '项目任务'
+      when 'forge_message'
+        '项目讨论'
+      when 'forge_news'
+        '项目新闻'
       when 'forum'
         '贴吧帖子'
       when 'user_feedback'
diff --git a/app/views/users/_selector_for_messages.html.erb b/app/views/users/_selector_for_messages.html.erb
new file mode 100644
index 000000000..0bffdca2b
--- /dev/null
+++ b/app/views/users/_selector_for_messages.html.erb
@@ -0,0 +1,37 @@
+<div class="homepageRightBanner">
+  <div class="NewsBannerName"><%= title_for_message(params[:type]) %></div>
+  <ul class="resourcesSelect">
+    <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+      <ul class="homepagePostType" style="width:130px; left:-130px;">
+        <li>
+          <ul class="homepagePostTypeHomework fl" style="width:70px;">
+            <li><%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %></li>
+            <li><%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "resourcesGrey" %></li>
+            <li><%= link_to "系统消息", user_system_messages_path(User.current), :class => "resourcesGrey" %></li>
+
+            <li class=""><strong>课程消息</strong></li>
+            <li><%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %></li>
+            <li><%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey"  %></li>
+            <li><%= link_to "课程通知",user_message_path(User.current, :type => 'course_news'), :class => "resourcesGrey"  %></li>
+            <li><%= link_to "课程问卷", user_message_path(User.current, :type => 'poll'), :class => "resourcesGrey"  %></a></li>
+          </ul>
+        </li>
+
+        <li>
+          <ul class="homepagePostTypeProject fl" style="width:60px;">
+            <li class=""><strong>项目消息</strong></li>
+            <li><%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey"  %></li>
+            <li><%= link_to "项目讨论", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey"  %></li>
+            <li><%= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey"  %></li>
+            <li><%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %></li>
+
+            <li class=""><strong>其他</strong></li>
+            <li><%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey"  %></li>
+            <%# 系统贴吧 %>
+            <li><%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey"  %></li>
+          </ul>
+        </li>
+      </ul>
+    </li>
+  </ul>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index fee28f761..07066f6dc 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -99,17 +99,17 @@
                 </p>
                 <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
                 <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
-                <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>@nbsp;&nbsp;24点</span></p>
-                <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>@nbsp;@nbsp;24点</span></p>
+                <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;24点</span></p>
+                <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;@&nbsp;24点</span></p>
                 <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
                 <p>请同学们抓紧时间提交自己的作品，谢谢！</p>
             <% else %>
                 <p><%= User.current.lastname + User.current.firstname %>老师您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了：</p>
                 <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
                 <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
-                <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>@nbsp;@nbsp;24点</span></p>
-                <p>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>@nbsp;@nbsp;24点</span></p>
-                <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>@nbsp;@nbsp;24点</span></p>
+                <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;24点</span></p>
+                <p>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;24点</span></p>
+                <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span></p>
                 <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
                 <p>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></p>
                 <p>您可以修改作业内容、评分规则、匿评过程等，谢谢！</p>
diff --git a/app/views/users/_user_message_userfeedaback.html.erb b/app/views/users/_user_message_userfeedaback.html.erb
index 672dfda64..23a0774c3 100644
--- a/app/views/users/_user_message_userfeedaback.html.erb
+++ b/app/views/users/_user_message_userfeedaback.html.erb
@@ -9,7 +9,7 @@
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %></span>
           </li>
           <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-            <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id),  :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+            <%= link_to ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, feedback_path(ma.journals_for_message.jour_id),  :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
                         :onmouseover =>"message_titile_show($(this),event)",
                         :onmouseout => "message_titile_hide($(this))" %></a>
           </li>
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index d0f7bb9bb..f83e5617c 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -1,37 +1,4 @@
-<div class="homepageRightBanner">
-  <div class="NewsBannerName"><%= title_for_message(params[:type]) %></div>
-  <ul class="resourcesSelect">
-    <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-      <ul class="homepagePostType">
-        <li>
-          <ul class="homepagePostTypeHomework fl">
-            <li><%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %></li>
-            <li><%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "resourcesGrey" %></li>
-            <li><%= link_to "系统消息", user_system_messages_path(User.current), :class => "resourcesGrey" %></li>
-
-            <li><%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %></li>
-            <li><%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey"  %></li>
-            <li><%= link_to "课程通知",user_message_path(User.current, :type => 'course_news'), :class => "resourcesGrey"  %></li>
-            <li><%= link_to "课程问卷", user_message_path(User.current, :type => 'poll'), :class => "resourcesGrey"  %></a></li>
-          </ul>
-        </li>
-
-        <li>
-          <ul class="homepagePostTypeProject fl">
-            <li><%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey"  %></li>
-            <li><%= link_to "项目讨论", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey"  %></li>
-            <li><%= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey"  %></li>
-            <li><%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %></li>
-
-            <li><%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey"  %></li>
-            <%# 系统贴吧 %>
-            <li><%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey"  %></li>
-          </ul>
-        </li>
-      </ul>
-    </li>
-  </ul>
-</div>
+<%= render :partial => 'users/selector_for_messages'%>
 <div class="resources mt10" id="users_setting">
   <div>
     <% if (!@message_alls.nil? && @message_alls.count >0) %>
diff --git a/app/views/users/user_system_messages.html.erb b/app/views/users/user_system_messages.html.erb
index 899cd7a8f..64b0dff0c 100644
--- a/app/views/users/user_system_messages.html.erb
+++ b/app/views/users/user_system_messages.html.erb
@@ -1,35 +1,4 @@
-<div class="homepageRightBanner">
-  <div class="NewsBannerName">系统消息</div>
-  <ul class="resourcesSelect">
-    <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-      <ul class="newsType">
-        <li><%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %></li>
-        <li><%= link_to "未读消息", user_message_path(User.current, :type => 'unviewed'), :class => "resourcesGrey" %></li>
-        <li><%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %></li>
-        <%# 课程相关消息 %>
-        <li><%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %></li>
-        <li><%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey"  %></li>
-        <li><%= link_to "课程通知",user_message_path(User.current, :type => 'course_news'), :class => "resourcesGrey"  %></li>
-        <!--<li><%#= link_to "通知回复", user_message_path(User.current, :type => 'course_news_reply'), :class => "resourcesGrey" %></li>-->
-        <!--<li><%#= link_to "课程问卷", user_message_path(User.current, :type => 'poll'), :class => "resourcesGrey"  %></a></li>-->
-        <!--<li><%#= link_to "作品评阅", user_message_path(User.current, :type => 'works_reviewers'), :class => "resourcesGrey"  %></li>-->
-        <!--<li><%#= link_to "作品讨论", user_message_path(User.current, :type => 'works_reply'), :class => "resourcesGrey"  %></li>-->
-        <%# 项目相关消息 %>
-        <li><%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey"  %></li>
-        <!--<li><%#= link_to "问题更新", user_message_path(User.current, :type => 'issue_update'), :class => "resourcesGrey"  %></li>-->
-        <!--<li><%#= link_to "项目讨论区", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey"  %></li>-->
-        <!--<li><%#= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey"  %></li>-->
-        <!--<li><%#= link_to "新闻回复", user_message_path(User.current, :type => 'forge_news_reply'), :class => "resourcesGrey"  %></li>-->
-        <%# 项目相关消息 %>
-        <li><%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey"  %></li>
-        <%# 系统贴吧 %>
-        <li><%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey"  %></li>
-        <%# 系统消息 %>
-        <li><%= link_to "系统消息", user_system_messages_path(User.current), :class => "resourcesGrey" %></li>
-      </ul>
-    </li>
-  </ul>
-</div>
+<%= render :partial => 'users/selector_for_messages'%>
 
 <% @sytem_messages.each do |system_message| %>
     <div class="resources mt10">