diff --git a/app/models/project.rb b/app/models/project.rb
index b5dbd3c1..88053a1c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -20,6 +20,11 @@ class Project < ActiveRecord::Base
     :class_name => 'Todo',
     :conditions => ["todos.state = ? ", "deferred"],
     :order => "show_from"
+  has_many :pending_todos,
+    :include => [:context,:tags,:project],
+    :class_name => 'Todo',
+    :conditions => ["todos.state = ? ", "pending"],
+    :order => "show_from"
 
   has_many :notes, :dependent => :delete_all, :order => "created_at DESC"
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 6ce58aa8..30c5a6fb 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -98,6 +98,10 @@ class User < ActiveRecord::Base
                 find(:all, :conditions => ['show_from <= ?', Time.zone.now ]).collect { |t| t.activate! }
               end
            end
+  has_many :pending_todos,
+           :class_name => 'Todo',
+           :conditions => [ 'state = ?', 'pending' ],
+           :order => 'show_from ASC, todos.created_at DESC'
   has_many :completed_todos,
            :class_name => 'Todo',
            :conditions => ['todos.state = ? AND NOT(todos.completed_at IS NULL)', 'completed'],