diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 7e44174fe..045f2b4e7 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -125,45 +125,33 @@ class UsersController < ApplicationController
             @message_alls << message_all.message
           end
         end
-      # when 'system_messages'
-      #   @message_alls = SystemMessage.order("created_at desc").all
-      when 'apply'
-        @message_alls = ForgeMessage.where("forge_message_type in ('ProjectInvite', 'AppliedProject') and user_id =?", @user).order("created_at desc")
+
+      #课程相关消息
       when 'homework'
         @message_alls = CourseMessage.where("course_message_type in ('HomeworkCommon','StudentWorksScore','JournalsForMessage') and user_id =?",  @user).order("created_at desc")
       when 'course_message'
         @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Message", @user).order("created_at desc")
-      when 'forge_message'
-        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Message", @user).order("created_at desc")
-      #   @message_alls_count = @message_alls.count
       when 'course_news'
         # 课程通知包含发布的通知和回复的通知
         @message_alls = CourseMessage.where("course_message_type =? or course_message_type =?", "News", "Comment").where("user_id =?", @user).order("created_at desc")
-      #@user_course_messages_count = @user_course_messages.count
-      # when 'forge_news'
-      #   @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "News", @user).order("created_at desc")
-      #   @message_alls_count = @message_alls.count
-      # when 'course_news_reply'
-      #   @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
-      # when 'forge_news_reply'
-      #   @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Comment", @user).order("created_at desc")
-      #   @message_alls_count = @message_alls.count
-      # when 'poll'
-      #   @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user).order("created_at desc")
-      #   @message_alls_count = @message_alls.count
-      # when 'works_reviewers'
-      #   @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "StudentWorksScore", @user).order("created_at desc")
-      #   @message_alls_count = @message_alls.count
-      # when 'works_reply'
-      #   @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "JournalsForMessage", @user).order("created_at desc")
-      #   @message_alls_count = @message_alls.count
+      when 'poll'
+        @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user).order("created_at desc")
+
+      #项目相关消息
       when 'issue'
         @message_alls = ForgeMessage.where("forge_message_type =? or forge_message_type =?" , "Issue", "Journal").where("user_id=?", @user).order("created_at desc")
-      # when 'issue_update' # 缺陷状态更新、留言
-      #   @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Journal", @user).order("created_at desc")
-      #   @message_alls_count = @message_alls.count
+      when 'forge_message'
+        @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Message", @user).order("created_at desc")
+      when 'forge_news'
+        @message_alls = ForgeMessage.where("forge_message_type in (?,?) and user_id =?", "News", "Comment", @user).order("created_at desc")
+      when 'apply'
+        @message_alls = ForgeMessage.where("forge_message_type in ('ProjectInvite', 'AppliedProject') and user_id =?", @user).order("created_at desc")
+
+      #贴吧消息
       when 'forum'
         @message_alls = MemoMessage.where("memo_type =? and user_id =?", "Memo", @user).order("created_at desc")
+
+      #用户留言
       when 'user_feedback'
         @message_alls = UserFeedbackMessage.where("journals_for_message_type =? and user_id =?", "JournalsForMessage", @user).order("created_at desc")
       else
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 813c13509..25900e737 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -12,26 +12,20 @@
             <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 => '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 => '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 => '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>
@@ -40,7 +34,7 @@
 </div>
 <div class="resources mt10" id="users_setting">
   <div>
-    <% if @message_alls.count >0 || @user_system_messages.count >0 %>
+    <% if (!@message_alls.nil? && @message_alls.count >0) || (!@user_system_messages.nil? && @user_system_messages.count >0) %>
         <% if params[:type].nil? || params[:type] == "unviewed" %>
             <div class="newsReadSetting">
               有&nbsp;<span class="c_red"><%= unviewed_message(@user) %></span>&nbsp;条未读