diff --git a/app/controllers/forum_topics_controller.rb b/app/controllers/forum_topics_controller.rb
index 7d299601a..16138b001 100644
--- a/app/controllers/forum_topics_controller.rb
+++ b/app/controllers/forum_topics_controller.rb
@@ -2,7 +2,6 @@ class ForumTopicsController < ApplicationController
   respond_to :html, :xml, :json
   before_filter :member_only, :except => [:index, :show]
   before_filter :normalize_search, :only => :index
-  after_filter :update_last_forum_read_at, :only => [:show]
 
   def new
     @forum_topic = ForumTopic.new
@@ -19,6 +18,7 @@ class ForumTopicsController < ApplicationController
   def index
     @query = ForumTopic.active.search(params[:search])
     @forum_topics = @query.order("is_sticky DESC, updated_at DESC").paginate(params[:page], :limit => params[:limit], :search_count => params[:search])
+    @read_forum_topic_ids = read_forum_topic_ids
     respond_with(@forum_topics) do |format|
       format.xml do
         render :xml => @forum_topics.to_xml(:root => "forum-topics")
@@ -31,6 +31,7 @@ class ForumTopicsController < ApplicationController
     @forum_posts = ForumPost.search(:topic_id => @forum_topic.id).order("forum_posts.id").paginate(params[:page])
     @forum_posts.all
     respond_with(@forum_topic)
+    session[:read_forum_topics] = @forum_topic.mark_as_read(read_forum_topic_ids)
   end
 
   def create
@@ -67,14 +68,6 @@ class ForumTopicsController < ApplicationController
   end
 
 private
-  def update_last_forum_read_at
-    return if CurrentUser.is_anonymous?
-
-    if CurrentUser.last_forum_read_at.nil? || CurrentUser.last_forum_read_at < @forum_topic.updated_at
-      CurrentUser.update_column(:last_forum_read_at, @forum_topic.updated_at)
-    end
-  end
-
   def normalize_search
     if params[:title_matches]
       params[:search] ||= {}
@@ -87,6 +80,14 @@ private
     end
   end
 
+  def read_forum_topics
+    session[:read_forum_topics].to_s
+  end
+
+  def read_forum_topic_ids
+    read_forum_topics.scan(/\S+/)
+  end
+
   def check_privilege(forum_topic)
     if !forum_topic.editable_by?(CurrentUser.user)
       raise User::PrivilegeError
diff --git a/app/logical/session_creator.rb b/app/logical/session_creator.rb
index 4ce44e334..829bac125 100644
--- a/app/logical/session_creator.rb
+++ b/app/logical/session_creator.rb
@@ -13,6 +13,7 @@ class SessionCreator
   def authenticate
     if User.authenticate(name, password)
       user = User.find_by_name(name)
+      user.update_column(:last_forum_read_at, user.last_logged_in_at)
       user.update_column(:last_logged_in_at, Time.now)
 
       if remember.present?
@@ -28,9 +29,17 @@ class SessionCreator
       end
 
       session[:user_id] = user.id
+      prune_read_forum_topics(user)
       return true
     else
       return false
     end
   end
+
+  def prune_read_forum_topics(user)
+    # if user.last_forum_read_at
+    #   read_forum_topic_ids = session[:read_forum_topics].to_s.scan(/\S+/)
+    #   session[:read_forum_topics] = read_forum_topic_ids.select {|x| ForumTopic.where("updated_at >= ? and id = ?", user.last_forum_read_at, x).exists?}.join(" ")
+    # end
+  end
 end
diff --git a/app/models/forum_topic.rb b/app/models/forum_topic.rb
index 5df02c2d3..996d2d510 100644
--- a/app/models/forum_topic.rb
+++ b/app/models/forum_topic.rb
@@ -104,4 +104,20 @@ class ForumTopic < ActiveRecord::Base
   def hidden_attributes
     super + [:text_index]
   end
+
+  def read_by?(user, read_forum_topic_ids)
+    return true if read_forum_topic_ids.include?(id.to_s)
+    return false if user.last_forum_read_at.nil?
+    return true if updated_at < user.last_forum_read_at
+    return false
+  end
+
+  def mark_as_read(read_forum_topic_ids)
+    result = (read_forum_topic_ids + [id.to_s]).uniq.join(" ")
+    if result.size > 3000
+      ids = result.scan(/\S+/)
+      result = ids[(ids.size / 2)..-1].join(" ")
+    end
+    result
+  end
 end
diff --git a/app/views/forum_topics/index.html.erb b/app/views/forum_topics/index.html.erb
index c14969da5..cacf5555d 100644
--- a/app/views/forum_topics/index.html.erb
+++ b/app/views/forum_topics/index.html.erb
@@ -24,7 +24,7 @@
                 <span class="sticky">Sticky:</span>
               <% end %>
 
-              <% if topic.updated_at > (CurrentUser.last_forum_read_at || Time.now) %>
+              <% unless topic.read_by?(CurrentUser.user, @read_forum_topic_ids) %>
                 <span class="new">NEW</span>
               <% end %>