diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index 9a407aa5..bb9b868a 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -50,17 +50,24 @@ module TodosHelper
     image_tag("defer_#{days}_off.png", :mouseover => "defer_#{days}.png", :alt => t('todos.defer_x_days', :count => days), :align => "absmiddle")+" "+t('todos.defer_x_days', :count => days)
   end
 
-  # waiting stuff can be deleted after migration of defer
-  def todo_start_waiting_js(todo)
-    return "$('#ul#{dom_id(todo)}').css('visibility', 'hidden'); $('##{dom_id(todo)}').block({message: null})"
-  end
-
+  # waiting stuff can be deleted after migration of defer and dependencies
   def successor_start_waiting_js(successor)
     return "$('##{dom_id(successor, "successor")}').block({message: null})"
   end
 
-  def todo_stop_waiting_js(todo)
-    return "$('##{dom_id(todo)}').unblock();enable_rich_interaction();"
+  def collapsed_notes_image(todo)
+    link = link_to(image_tag( 'blank.png', :width=>'16', :height=>'16', :border=>'0' ), "#", {:class => 'show_notes', :title => 'Show notes'})
+    notes = content_tag(:div, {:class => "todo_notes", :id => dom_id(todo, 'notes'), :style => "display:none"}) { format_note(todo.notes) }
+    return link+notes
+  end
+
+  def collapsed_successors_image(todo)
+    link = link_to(image_tag( 'blank.png', :width=>'16', :height=>'16', :border=>'0' ), "#", {:class => 'show_successors', :title => 'Show successors'})
+    successors = content_tag(:div, {:class => "todo_successors", :id => dom_id(todo, 'successors'), :style => "display:none"}) do
+      render :partial => "todos/successor", :collection => todo.pending_successors,
+        :locals => { :parent_container_type => parent_container_type, :suppress_dependencies => true, :predecessor => todo }
+    end
+    return link+successors
   end
 
   def image_tag_for_recurring_todo(todo)
diff --git a/app/views/todos/_todo.html.erb b/app/views/todos/_todo.html.erb
index 01676ed6..e98af6ad 100644
--- a/app/views/todos/_todo.html.erb
+++ b/app/views/todos/_todo.html.erb
@@ -32,8 +32,8 @@ parameters += "&_tag_name=#{@tag_name}" if @source_view == 'tag'
       <%= tag_list %>
       <%= deferred_due_date %>
       <%= project_and_context_links( parent_container_type, :suppress_context => suppress_context, :suppress_project => suppress_project ) %>
-      <%= render(:partial => "todos/toggle_notes", :object => todo) if todo.notes? %>
-      <%= render(:partial => "todos/toggle_successors", :object => todo) unless todo.pending_successors.empty? %>
+      <%= collapsed_notes_image(todo) if todo.notes? %>
+      <%= collapsed_successors_image(todo) unless todo.pending_successors.empty? %>
     </div>
   </div>
   <div id="<%= dom_id(todo, 'edit') %>" class="edit-form" style="display:none">
diff --git a/app/views/todos/_toggle_notes.rhtml b/app/views/todos/_toggle_notes.rhtml
deleted file mode 100644
index 141eb0f5..00000000
--- a/app/views/todos/_toggle_notes.rhtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<% item = toggle_notes -%>
-<%= link_to(image_tag( 'blank.png', :width=>'16', :height=>'16', :border=>'0' ), "#", {:class => 'show_notes', :title => 'Show notes'}) %>
-
-<div class="todo_notes" id="<%= dom_id(item, 'notes') %>" style="display:none">
-  <%= format_note(item.notes) %>
-</div>
\ No newline at end of file
diff --git a/app/views/todos/_toggle_successors.html.erb b/app/views/todos/_toggle_successors.html.erb
deleted file mode 100644
index 089d3821..00000000
--- a/app/views/todos/_toggle_successors.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<% item = toggle_successors %>
-<%= link_to(image_tag( 'blank.png', :width=>'16', :height=>'16', :border=>'0' ), "#", {:class => 'show_successors', :title => 'Show successors'}) %>
-
-<div class="todo_successors" id="<%= dom_id(item, 'successors') %>">
-  <%= render :partial => "todos/successor",
-             :collection => item.pending_successors,
-             :locals => { :parent_container_type => parent_container_type, 
-                          :suppress_dependencies => true,
-                          :predecessor => item }
-  %>
-</div>
-
diff --git a/features/tickler.feature b/features/tickler.feature
index 45c1b3c1..3c6462a1 100644
--- a/features/tickler.feature
+++ b/features/tickler.feature
@@ -10,6 +10,15 @@ Feature: Manage deferred todos
     And there exists a project "manage me" for user "testuser"
     And I have logged in as "testuser" with password "secret"
 
+  @selenium @wip
+  Scenario: I can add a deferred todo and it will show in the tickler
+    # also adding the first deferred todo will hide the empty message
+    When I go to the tickler
+    Then I should see the empty tickler message
+    When I submit a deferred new action with description "a new next action"
+    Then I should see "a new next action"
+    And I should not see the empty tickler message
+
   Scenario: Editing the description of a todo updated the todo
     Given this is a pending scenario