diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index d8be9d1f..074be7d5 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -262,9 +262,10 @@ module TodosHelper
   end
   
   def empty_container_msg_div_id
-    return "tickler-empty-nd" if source_view_is_one_of(:project, :tag) && @todo.deferred?
-    return "p#{@todo.project_id}empty-nd" if source_view_is :project
-    return "c#{@todo.context_id}empty-nd"
+    todo = @todo || @successor
+    return "tickler-empty-nd" if source_view_is_one_of(:project, :tag) && todo.deferred?
+    return "p#{todo.project_id}empty-nd" if source_view_is :project
+    return "c#{todo.context_id}empty-nd"
   end
   
   def project_names_for_autocomplete
diff --git a/app/views/todos/remove_predecessor.js.rjs b/app/views/todos/remove_predecessor.js.rjs
index 74f639c7..734d24a6 100644
--- a/app/views/todos/remove_predecessor.js.rjs
+++ b/app/views/todos/remove_predecessor.js.rjs
@@ -9,6 +9,8 @@ if @removed
   # update display if pending->active
   if @successor.active?
       page[@successor].remove unless source_view_is_one_of(:todo, :context)
+      page[empty_container_msg_div_id].hide unless empty_container_msg_div_id.nil?
+      page.call "todoItems.ensureVisibleWithEffectAppear", "c#{@successor.context_id}"
       page.insert_html :bottom, item_container_id(@successor), :partial => 'todos/todo', :locals => { 
         :todo => @successor, :parent_container_type => parent_container_type }
       page.visual_effect :highlight, dom_id(@successor, 'line'), {'startcolor' => "'#99ff99'"}
diff --git a/test/fixtures/dependencies.yml b/test/fixtures/dependencies.yml
new file mode 100644
index 00000000..d1180d8e
--- /dev/null
+++ b/test/fixtures/dependencies.yml
@@ -0,0 +1,3 @@
+buy_stock_then_email_broker:
+  successor_id: 19
+  predecessor_id: 11
diff --git a/test/fixtures/todos.yml b/test/fixtures/todos.yml
index 06a89436..ce26e327 100644
--- a/test/fixtures/todos.yml
+++ b/test/fixtures/todos.yml
@@ -243,4 +243,13 @@ call_bill_gates_every_day:
   due: <%= last_week %>
   completed_at: ~
   show_from: ~
-  recurring_todo_id: 1
\ No newline at end of file
+  recurring_todo_id: 1
+
+email_broker:
+  id: 19
+  user_id: 1
+  context_id: 3
+  description: Ask about better stocks
+  notes: ~
+  state: pending
+  
diff --git a/test/functional/stats_controller_test.rb b/test/functional/stats_controller_test.rb
index c3f7fabe..3b0fb30e 100755
--- a/test/functional/stats_controller_test.rb
+++ b/test/functional/stats_controller_test.rb
@@ -56,7 +56,7 @@ class StatsControllerTest < ActionController::TestCase
     assert_equal 3, assigns['projects'].count
     assert_equal 3, assigns['projects'].count(:conditions => "state = 'active'")
     assert_equal 10, assigns['contexts'].count
-    assert_equal 16, assigns['actions'].count
+    assert_equal 17, assigns['actions'].count
     assert_equal 4, assigns['tags_count']
     assert_equal 2, assigns['unique_tags_count']
     assert_equal 2.week.ago.at_midnight, assigns['first_action'].created_at.at_midnight
diff --git a/test/selenium/dependencies/unhide_hidden_context.rsel b/test/selenium/dependencies/unhide_hidden_context.rsel
new file mode 100644
index 00000000..07c0383b
--- /dev/null
+++ b/test/selenium/dependencies/unhide_hidden_context.rsel
@@ -0,0 +1,8 @@
+# Test for issue #964
+setup :fixtures => :all
+login :as => 'admin'
+Todo.create(:context => Context.find(3), :description => 'foo')
+open "/"
+click "css=#successor_todo_19 img.delete_item"
+wait_for_visible 'flash'
+assert_visible 'c3'
diff --git a/test/selenium/mobile/navigation.rsel b/test/selenium/mobile/navigation.rsel
index 2d6efdb2..279fb5c6 100644
--- a/test/selenium/mobile/navigation.rsel
+++ b/test/selenium/mobile/navigation.rsel
@@ -31,5 +31,5 @@ wait_for_text 'css=h1 span.count', '2'
 
 # just test the navigation. 
 click_and_wait "link=Tickler"
-wait_for_text 'css=h1 span.count', '0'
+wait_for_text 'css=h1 span.count', '1'
 click_and_wait "link=Feeds"