--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -3,14 +3,6 @@ class MembersController < ApplicationController
   before_filter :find_project
 
   def index
-    @title, @url_suffix = Project.tab_settings(PRJ_TAB_MEMBERS)
-    @members = Member.find_by_project_alpha(@project.id)
-    if @is_member
-      @messages = Message.find_by_project_user(@project.id, current_user.id, 40)
-    else
-      @messages = Message.find_by_project(@project.id, 40)
-    end
-    render :action => "ac_project_index"
   end
   
 end

--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -89,6 +89,17 @@ class ProjectsController < ApplicationController
     render :action => "ac_forum"
   end
 
+  def team
+    @title, @url_suffix = Project.tab_settings(PRJ_TAB_TEAM)
+    @members = Member.find_by_project_alpha(@project.id)
+    if @is_member
+      @messages = Message.find_by_project_user(@project.id, current_user.id, 40)
+    else
+      @messages = Message.find_by_project(@project.id, 40)
+    end
+    render :action => "ac_team"
+  end
+
   def roadmap
     @title, @url_suffix = Project.tab_settings(PRJ_TAB_SUMMARY)
     render :action => "ac_roadmap"

--- a/app/controllers/tickets_controller.rb
+++ b/app/controllers/tickets_controller.rb
@@ -5,6 +5,7 @@ class TicketsController < ApplicationController
   def index
     @title, @url_suffix = Project.tab_settings(PRJ_TAB_TICKETS)
     @tickets = Ticket.filtered(params[:ticket] ? params[:ticket] : "")
+    #@assignees = @project.tickets.assignees
     render :action => "ac_project_index"
   end
 

--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -328,23 +328,23 @@ module ApplicationHelper
     out = %Q{<table class='right_default_table'>}
     out << %Q{<tr><th>Actions</th></tr>}
     #
-    #FIXME finish this, also it must must only be true if logged_in?
-    logged_in? ? is_member = true : is_member = false
     acts = ""
     acts << %Q{<li>#{link_to("List Wiki Pages", project_wikis_path(@project.slug))}</li>} if flags[:list_project_wikis]
-    acts << %Q{<li>#{link_to("Edit Wiki Page", edit_project_wiki_path(@project.slug, @wiki.slug))}</li>} if flags[:edit_project_wiki] && is_member
-    acts << %Q{<li>#{link_to("New Wiki Page", new_project_wiki_path(@project.slug))}</li>} if flags[:new_project_wiki] && is_member
-    acts << %Q{<li>#{link_to("Edit Article", edit_project_article_path(@project.slug, @article.slug))}</li>} if flags[:edit_article] && is_member
-    acts << %Q{<li>#{link_to("New Article", new_project_article_path(@project.slug))}</li>} if flags[:new_article] && is_member
+    acts << %Q{<li>#{link_to("Edit Wiki Page", edit_project_wiki_path(@project.slug, @wiki.slug))}</li>} if flags[:edit_project_wiki] && @is_member
+    acts << %Q{<li>#{link_to("New Wiki Page", new_project_wiki_path(@project.slug))}</li>} if flags[:new_project_wiki] && @is_member
+    acts << %Q{<li>#{link_to("Edit Article", edit_project_article_path(@project.slug, @article.slug))}</li>} if flags[:edit_article] && @is_member
+    acts << %Q{<li>#{link_to("New Article", new_project_article_path(@project.slug))}</li>} if flags[:new_article] && @is_member
     acts << %Q{<li>#{link_to("New Ticket", new_project_ticket_path(@project.slug))}</li>} if flags[:new_ticket]
     acts << %Q{<li>#{link_to("Edit Ticket", edit_project_ticket_path(@project.slug))}</li>} if flags[:edit_ticket]
     acts << %Q{<li>#{link_to("Close Ticket", root_path)}</li>} if flags[:close_ticket]
     acts << %Q{<li>#{link_to("List Tickets", project_tickets_path(@project.slug))}</li>} if flags[:list_tickets]
-    acts << %Q{<li>#{link_to("New Milestone", new_project_milestone_path(@project.slug))}</li>} if flags[:new_milestone] && is_member
+    acts << %Q{<li>#{link_to("New Milestone", new_project_milestone_path(@project.slug))}</li>} if flags[:new_milestone] && @is_member
     acts << %Q{<li>#{link_to("List Active Milestones", root_path)}</li>} if flags[:list_active_milestones]
     acts << %Q{<li>#{link_to("List Completed Milestones", root_path)}</li>} if flags[:list_completed_milestones]
-    acts << %Q{<li>#{link_to("Edit Milestones", root_path)}</li>} if flags[:edit_milestones] && is_member
-    acts << %Q{<li>#{link_to("Edit Components", root_path)}</li>} if flags[:edit_components] && is_member
+    acts << %Q{<li>#{link_to("Edit Milestones", root_path)}</li>} if flags[:edit_milestones] && @is_member
+    acts << %Q{<li>#{link_to("Edit Components", root_path)}</li>} if flags[:edit_components] && @is_member
+    acts << %Q{<li>#{link_to("New Member", root_path)}</li>} if flags[:new_member] && @is_member
+    acts << %Q{<li>#{link_to("List Members", root_path)}</li>} if flags[:list_members]
     acts << %Q{<li>#{link_to("Clone Mainline", new_project_repository_path(@project.slug, @repository))}</li>} if flags[:clone_mainline] && logged_in?
     out << %Q{<tr><td><ul>#{acts}</ul></td></tr>} if acts != ""    
     out << %Q{<tr><td>#{actionbox_default(flags)}</td></tr>}

--- /dev/null
+++ b/app/helpers/messages_helper.rb
@@ -0,0 +1,2 @@
+module MessagesHelper
+end

--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -64,7 +64,7 @@ module ProjectsHelper
     out << "<ul id='tabmenu'>"
     out << project_tab(active_tab, PRJ_TAB_SUMMARY)
     out << project_tab(active_tab, PRJ_TAB_GIT)
-    out << project_tab(active_tab, PRJ_TAB_MEMBERS)
+    out << project_tab(active_tab, PRJ_TAB_TEAM)
     out << project_tab(active_tab, PRJ_TAB_TICKETS)
     out << project_tab(active_tab, PRJ_TAB_WIKI)
     out << project_tab(active_tab, PRJ_TAB_ARTICLES)
@@ -120,10 +120,15 @@ module ProjectsHelper
       when PRJ_TAB_GIT_MERGEREQUESTS
         out << actionbox_basic(:allow_shortcuts => true)
       end
-    when PRJ_TAB_MEMBERS
-      out << actionbox_basic(:allow_shortcuts => true)
-      out << render(:partial => "ac_right_actionbox_post_message") if @is_member
-      out << render_right_project_members
+    when PRJ_TAB_TEAM
+      case subtab
+      when PRJ_TAB_SUBTAB_NONE
+        out << actionbox_complex(:allow_shortcuts => true, :new_member => true, :list_members => true)
+        out << render(:partial => "messages/ac_right_actionbox_post_message") if @is_member
+        out << render_right_project_members
+      when PRJ_TAB_TEAM_NEW
+      when PRJ_TAB_TEAM_LIST
+      end
     when PRJ_TAB_TICKETS
       case subtab
       when PRJ_TAB_SUBTAB_NONE

--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -55,7 +55,7 @@ protected
   
   #public version of .count to filter articles you are not authorised to see
   def self.public_count (curruser)
-    @projects = Project.list_for_user(curruser)
+    @projects = Project.list_for_user(curruser.id)
     #FIXME is there a faster way of doing this?
     @articles = find(:all, :conditions => ["status = '#{:published}' AND ( audience = '#{:public}' OR project_id IN (" << @projects << ") )"], :order => "created_at DESC")
     return @articles.size
@@ -66,25 +66,25 @@ protected
   #
   def self.find_by_date (curruser, year, month = nil, day = nil)
     from, to = self.time_delta(year, month, day)
-    @projects = Project.list_for_user(curruser)
+    @projects = Project.list_for_user(curruser.id)
     find(:all, :conditions => [ "status = '#{:published}' AND (created_at BETWEEN ? AND ?) AND ( audience = '#{:public}' OR project_id IN (" << @projects << ") )", from, to ])
   end
 
   #
   def self.find_all_articles (curruser)
-    @projects = Project.list_for_user(curruser)
+    @projects = Project.list_for_user(curruser.id)
     find(:all, :conditions => ["status = '#{:published}' AND ( audience = '#{:public}' OR project_id IN (" << @projects << ") )"], :order => "created_at DESC")
   end
 
   #
   def self.find_home (curruser)
-    @projects = Project.list_for_user(curruser)
+    @projects = Project.list_for_user(curruser.id)
     find(:all, :conditions => ["status = '#{:published}' AND ( audience = '#{:public}' OR project_id IN (" << @projects << ") )"], :order => "created_at DESC", :limit => 3)
   end
 
   # finds articles for a user based on the user slug e.g. /profiles/test-user/articles
   def self.find_by_id (id, curruser)
-    @projects = Project.list_for_user(curruser)
+    @projects = Project.list_for_user(curruser.id)
     find(:first, :conditions => ["status = '#{:published}' AND id = '#{id}' AND ( audience = '#{:public}' OR project_id IN (" << @projects << ") )"])
   end
   
@@ -95,31 +95,31 @@ protected
   
   # finds articles for a user based on the user slug e.g. /profiles/test-user/articles
   def self.find_by_user (user_id, curruser)
-    @projects = Project.list_for_user(curruser)
+    @projects = Project.list_for_user(curruser.id)
     find(:all, :conditions => ["status = '#{:published}' AND user_id = '#{user_id}' AND ( audience = '#{:public}' OR project_id IN (" << @projects << ") )"], :order => "created_at DESC")
   end
 
   # finds articles for a user/project based on the user slug e.g. /profiles/test-user/project/project_id/articles
   def self.find_by_user_project (user_id, project_id, curruser)
-    @projects = Project.list_for_user(curruser)
+    @projects = Project.list_for_user(curruser.id)
     find(:all, :conditions => ["status = '#{:published}' AND user_id = '#{user_id}' AND project_id = '#{project_id}' AND ( audience = '#{:public}' OR project_id IN (" << @projects << ") )"], :order => "created_at DESC")
   end
   
   #
   def self.find_by_permalink (permalink, curruser)
-    @projects = Project.list_for_user(curruser)
+    @projects = Project.list_for_user(curruser.id)
     find(:first, :conditions => ["status = '#{:published}' AND permalink = '#{permalink}' AND ( audience = '#{:public}' OR project_id IN (" << @projects << ") )"])
   end
 
   #
   def self.find_by_type (article_type, curruser)
-    @projects = Project.list_for_user(curruser)
+    @projects = Project.list_for_user(curruser.id)
     find(:all, :conditions => ["status = '#{:published}' AND article_type = '#{article_type}' AND ( audience = '#{:public}' OR project_id IN (" << @projects << ") )"], :order => "created_at DESC")
   end
   
   #
   def self.find_by_category (category_id, curruser)
-    @projects = Project.list_for_user(curruser)
+    @projects = Project.list_for_user(curruser.id)
     find(:all, :conditions => ["status = '#{:published}' AND category_id = '#{category_id}' AND ( audience = '#{:public}' OR project_id IN (" << @projects << ") )"], :order => "created_at DESC")
   end
 
@@ -130,7 +130,7 @@ protected
   
   #
   def self.find_by_project (project_id, curruser)
-    projects_allowed = Project.list_for_user(curruser)
+    projects_allowed = Project.list_for_user(curruser.id)
     find(:all, :conditions => ["status = '#{:published}' AND project_id = '#{project_id}' AND ( audience = '#{:public}' OR project_id IN (" << projects_allowed << ") )"], :order => "created_at DESC")
   end
 
@@ -146,7 +146,7 @@ protected
 
   #
   def self.find_by_project_and_type (article_type, project_id, curruser)
-    projects_allowed = Project.list_for_user(curruser)
+    projects_allowed = Project.list_for_user(curruser.id)
     find(:all, :conditions => ["status = '#{:published}' AND project_id = '#{project_id}' AND article_type = '#{article_type}' AND ( audience = '#{:public}' OR project_id IN (" << projects_allowed << ") )"], :order => "created_at DESC")
   end
 

--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -14,7 +14,7 @@ class Category < ActiveRecord::Base
 
     #
     def self.find_by_all_with_count (curruser)
-      @projects = Project.list_for_user(curruser)
+      @projects = Project.list_for_user(curruser.id)
       find_by_sql ["SELECT categories.name, category_type, categories.slug, COUNT(articles.id) AS num_articles FROM categories JOIN articles ON categories.id = articles.category_id WHERE articles.status = '#{:published}' AND (articles.audience = '#{:public}' OR articles.project_id IN (" << @projects << ") ) GROUP BY articles.category_id ORDER BY parent ASC, categories.name"]
     end
 

--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -6,24 +6,24 @@ class Milestone < ActiveRecord::Base
   protected
 
   def self.find_by_project(project_id, curruser)
-    projects_allowed = Project.list_for_user(curruser)
+    projects_allowed = Project.list_for_user(curruser.id)
     find(:all, :conditions => ["project_id = '#{project_id}' AND ( audience = '#{:public}' OR project_id IN (" << projects_allowed << ") )"], :order => "created_at DESC")
   end
 
   #FIXME maybe expand this to return all tasks so it doesn't need to revisit table so many times
   #to display roadmap, except it's now also used by the project summary tab
   def self.roadmap(project_id, curruser)
-    projects_allowed = Project.list_for_user(curruser)
+    projects_allowed = Project.list_for_user(curruser.id)
     find(:all, :conditions => ["project_id = '#{project_id}' AND NOT status = 'complete'  AND ( audience = '#{:public}' OR project_id IN (" << projects_allowed << ") )"], :order => "due_date ASC")
   end
 
   def self.find_by_project_excl_proposed(project_id, curruser)
-    projects_allowed = Project.list_for_user(curruser)
+    projects_allowed = Project.list_for_user(curruser.id)
     find(:all, :conditions => ["project_id = '#{project_id}' AND status <> '#{:proposed}' AND ( audience = '#{:public}' OR project_id IN (" << projects_allowed << ") )"], :order => "created_at DESC")
   end
   
   def self.find_by_id(milestone_id, curruser)
-    projects_allowed = Project.list_for_user(curruser)
+    projects_allowed = Project.list_for_user(curruser.id)
     #FIXME don't need the ORDER BY as it only returns one result, should probably check for other cases of this
     find(:first, :conditions => ["id = '#{milestone_id}' AND ( audience = '#{:public}' OR project_id IN (" << projects_allowed << ") )"], :order => "created_at DESC")
   end

--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1,6 +1,8 @@
 class Project < ActiveRecord::Base
+
   belongs_to  :user
   has_many    :comments, :dependent => :destroy
+  has_many    :tickets
   has_many    :repositories, :order => "repositories.mainline desc, repositories.created_at asc",
     :dependent => :destroy
   has_one     :mainline_repository, :conditions => ["mainline = ?", true],
@@ -56,7 +58,7 @@ class Project < ActiveRecord::Base
   end
 
   def self.find_by_slug(slug, curruser)
-    projects_allowed = Project.list_for_user(curruser)
+    projects_allowed = Project.list_for_user(curruser.id)
     find(:first, :conditions => ["status = '#{:active}' AND projects.slug = '#{slug}' AND ( audience = '#{:public}' OR projects.id IN (#{projects_allowed}) )"])
   end
 
@@ -146,32 +148,32 @@ class Project < ActiveRecord::Base
 
     #
     def self.allowed_access (project_id, curruser)
-      projects_allowed = Project.list_for_user(curruser)
+      projects_allowed = Project.list_for_user(curruser.id)
       find(:first, :conditions => ["status = '#{:active}' AND projects.id = '" << project_id.to_s << "' AND ( audience = '#{:public}' OR projects.id IN (" << projects_allowed << ") )"])
     end
 
     #
     #FIXME this should maybe show inactive too
     def self.find_by_user(user, curruser)
-      projects_allowed = Project.list_for_user(curruser)
+      projects_allowed = Project.list_for_user(curruser.id)
       projects_available = Project.list_for_user(user)
       find(:all, :conditions => ["status = '#{:active}' AND projects.id IN (" << projects_available << ") AND ( audience = '#{:public}' OR projects.id IN (" << projects_allowed << ") )"])
     end
 
     # returns all allowed projects
     def self.find_all_projects (curruser)
-      projects_allowed = Project.list_for_user(curruser)
+      projects_allowed = Project.list_for_user(curruser.id)
       find(:all, :conditions => ["status = '#{:active}' AND ( audience = '#{:public}' OR id IN (" << projects_allowed << ") )"])
     end
 
     def self.find_popular_projects (curruser)
-      projects_allowed = Project.list_for_user(curruser)
+      projects_allowed = Project.list_for_user(curruser.id)
       find(:all, :conditions => ["status = '#{:active}' AND ( audience = '#{:public}' OR id IN (" << projects_allowed << ") )"], :limit => 10, :order => "views DESC")
     end
     
     # returns all public projects (no private regardless of allowed)
     def self.find_all_active_public_projects (curruser)
-      projects_allowed = Project.list_for_user(curruser)
+      projects_allowed = Project.list_for_user(curruser.id)
       find(:all, :conditions => ["status = '#{:active}' AND ( audience = '#{:public}' AND NOT id IN (" << projects_allowed << ") )"])
     end
 
@@ -185,17 +187,17 @@ class Project < ActiveRecord::Base
     
     # takes a list of project_ids e.g. '1','2','3'
     def self.find_by_list (list, curruser)
-      projects_allowed = Project.list_for_user(curruser)
+      projects_allowed = Project.list_for_user(curruser.id)
       find(:all, :conditions => ["status = '#{:active}' AND id IN (" << list << ") AND ( audience = '#{:public}' AND id IN (" << projects_allowed << ") )"])
     end
 
     #
     # Get a list of project_ids of a user is a members of in the format '1','2','3'
     #
-    def self.list_for_user(user)
-      if user
+    def self.list_for_user(user_id)
+      if user_id
         list = ""
-        projects = Member.find_by_user(user.id)
+        projects = Member.find_by_user(user_id)
         unless projects.empty?
           start = true
           for project in projects
@@ -219,9 +221,9 @@ class Project < ActiveRecord::Base
       when PRJ_TAB_GIT
         title = "Git"
         url_suffix = "/git/"
-      when PRJ_TAB_MEMBERS
-        title = "Members"
-        url_suffix = "/members/"
+      when PRJ_TAB_TEAM
+        title = "Team"
+        url_suffix = "/team/"
       when PRJ_TAB_WIKI
         title = "Wiki"
         url_suffix = "/wikis/" + wiki_slug

--- a/app/models/ticket.rb
+++ b/app/models/ticket.rb
@@ -2,9 +2,8 @@ require "digest/sha1"
 
 class Ticket < ActiveRecord::Base
   
-
-  belongs_to :assignee, :class_name => 'User', :foreign_key => 'assignee_id' 
-  belongs_to :submitter, :class_name => 'User', :foreign_key => 'submitter_id' 
+  belongs_to :assignee, :class_name => 'User', :foreign_key => 'assignee_id'
+  belongs_to :submitter, :class_name => 'User', :foreign_key => 'submitter_id'
 
   def formatted_ttype
     case self.ttype
@@ -60,7 +59,6 @@ class Ticket < ActiveRecord::Base
                  ORDER BY created_at DESC
                  LIMIT 3") if first_milestone
   end
-
   
   def self.qconcat (filters, types, lstart)
     s = ""

--- a/app/models/user/user.rb
+++ b/app/models/user/user.rb
@@ -141,7 +141,7 @@ class User < ActiveRecord::Base
     
     def self.find_popular_authors (curruser)
       #FIXME see note in Article model about major conflict on audience
-      projects_allowed = Project.list_for_user(curruser)
+      projects_allowed = Project.list_for_user(curruser.id)
       find_by_sql ["SELECT *, COUNT(articles.id) AS num_articles FROM users JOIN articles ON users.id = articles.user_id WHERE articles.status = '#{:published}' AND (articles.audience = '#{:public}' OR project_id IN (" << projects_allowed << ") ) GROUP BY users.id ORDER BY num_articles DESC"]
     end
 end

--- a/app/views/members/_ac_list_messages.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<ul>
-<% @messages.each do |m| %>
-  <li>
-  <% if show_name %>
-  <strong><%= m.user.fullname %></strong>
-  <% end %>
-  <%= m.activity %>
-  <span class='small_grey'>(<%= time_ago_in_words(m.created_at) %> ago)</span>
-  </li>
-<% end %>
-</ul>
\ No newline at end of file

--- a/app/views/members/_ac_right_actionbox_post_message.html.erb
+++ /dev/null
@@ -1,15 +0,0 @@
-
-<table class='right_input'>
-<tr><td>
-<% form_for :message, :url => project_members_path(@project.slug), :method => :post, :html => {:name => 'postmessage', :id => 'input'} do |f| -%>
-  
-  <label>Message:</label>
-  <%= f.text_area(:activity, :rows => 2) -%>
-  
-  <p>
-    <a href="javascript:document.postmessage.submit();">Update</a>
-  </p>
-  
-<% end -%>
-</td></tr>
-</table>
\ No newline at end of file

--- a/app/views/members/ac_project_index.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
-<%= render :partial => "projects/ac_project_header", :locals => { :tab => PRJ_TAB_MEMBERS,
-                                                                  :subtab => PRJ_TAB_SUBTAB_NONE,
-                                                                  :project => @project,
-                                                                  :pagetitle => @title } %>
-
-<% if @is_member && !@members.empty? %>
-<div id='projectmembers'>
-<ul>
-<% @members.each do |m| %>
-  <% if m.user != current_user %>
-  <li><%= m.user.fullname %></li>
-  <% end %>
-<% end %>
-</ul>
-</div>
-<% end %>
-  
-<%= div_formattedtext_open %>
-
-<h4>Recent Messages</h4>
-<%= render :partial => "ac_list_messages", :locals => { :show_name => !@is_member } %>
-
-<%= div_formattedtext_close %>
-
-<%= render :partial => "projects/ac_project_footer" %>

--- /dev/null
+++ b/app/views/messages/_ac_list_messages.html.erb
@@ -0,0 +1,11 @@
+<ul>
+<% @messages.each do |m| %>
+  <li>
+  <% if show_name %>
+  <strong><%= m.user.fullname %></strong>
+  <% end %>
+  <%= m.activity %>
+  <span class='small_grey'>(<%= time_ago_in_words(m.created_at) %> ago)</span>
+  </li>
+<% end %>
+</ul>
\ No newline at end of file

--- /dev/null
+++ b/app/views/messages/_ac_right_actionbox_post_message.html.erb
@@ -0,0 +1,15 @@
+
+<table class='right_input'>
+<tr><td>
+<% form_for :message, :url => project_members_path(@project.slug), :method => :post, :html => {:name => 'postmessage', :id => 'input'} do |f| -%>
+  
+  <label>Message:</label>
+  <%= f.text_area(:activity, :rows => 2) -%>
+  
+  <p>
+    <a href="javascript:document.postmessage.submit();">Update</a>
+  </p>
+  
+<% end -%>
+</td></tr>
+</table>
\ No newline at end of file

--- a/app/views/projects/ac_show.html.erb
+++ b/app/views/projects/ac_show.html.erb
@@ -34,7 +34,7 @@
 <% unless @messages.empty? %>
 <h4>Recent Messages</h4>
 <hr />
-<%= render :partial => "members/ac_list_messages", :locals => { :show_name => true } %>
+<%= render :partial => "messages/ac_list_messages", :locals => { :show_name => true } %>
 <%= link_to "[more]", project_members_path(@project), :class => "small" %><br />
 <% end %>
 

--- /dev/null
+++ b/app/views/projects/ac_team.html.erb
@@ -0,0 +1,25 @@
+<%= render :partial => "ac_project_header", :locals => { :tab => PRJ_TAB_TEAM,
+                                                         :subtab => PRJ_TAB_SUBTAB_NONE,
+                                                         :project => @project,
+                                                         :pagetitle => @title } %>
+
+<% if @is_member && !@members.empty? %>
+<div id='projectmembers'>
+<ul>
+<% @members.each do |m| %>
+  <% if m.user != current_user %>
+  <li><%= m.user.fullname %></li>
+  <% end %>
+<% end %>
+</ul>
+</div>
+<% end %>
+  
+<%= div_formattedtext_open %>
+
+<h4>Recent Messages</h4>
+<%= render :partial => "messages/ac_list_messages", :locals => { :show_name => !@is_member } %>
+
+<%= div_formattedtext_close %>
+
+<%= render :partial => "ac_project_footer" %>

--- a/app/views/tickets/_ac_right_ticket_filter.html.erb
+++ b/app/views/tickets/_ac_right_ticket_filter.html.erb
@@ -31,7 +31,18 @@
 <%= check_box(:ticket, :priority_critical, {:checked => ticket_value_checked?(:priority_critical)}, "1", "0") %>Critical<br />
 <br />
 </small></td>
-    
+
+</tr>
+
+<tr>
+<td colspan=2><small>
+Milestone: <br />
+Assignee:<br />
+Submitter:<br />
+
+  
+Sort by:<br />
+</small></td>
 </tr>
 
 <tr><td colspan=2>