diff --git a/app/views/todos/_edit_form.rhtml b/app/views/todos/_edit_form.rhtml
index 10b9e3ed..c9cf4eb0 100644
--- a/app/views/todos/_edit_form.rhtml
+++ b/app/views/todos/_edit_form.rhtml
@@ -11,55 +11,55 @@
 <%= text_area( "todo", "notes", "cols" => 29, "rows" => 4, "tabindex" => 9) %>
 
 <div class="project_input">
-<label for="<%= dom_id(@todo, 'project_name') %>">Project</label>
-<input id="<%= dom_id(@todo, 'project_name') %>" name="project_name" autocomplete="off" tabindex="10" size="30" type="text" value="<%= @todo.project.nil? ? 'None' : @todo.project.name.gsub(/"/,"&quot;") %>" />
-<div class="page_name_auto_complete" id="<%= dom_id(@todo, 'project_list') %>" style="display:none"></div>
+  <label for="<%= dom_id(@todo, 'project_name') %>">Project</label>
+  <input id="<%= dom_id(@todo, 'project_name') %>" name="project_name" autocomplete="off" tabindex="10" size="30" type="text" value="<%= @todo.project.nil? ? 'None' : @todo.project.name.gsub(/"/,"&quot;") %>" />
+  <div class="page_name_auto_complete" id="<%= dom_id(@todo, 'project_list') %>" style="display:none"></div>
 
-<script type="text/javascript">
-<%= dom_id(@todo, 'project_autocompleter') %> = new Autocompleter.Local('<%= dom_id(@todo, 'project_name') %>', '<%= dom_id(@todo, 'project_list') %>', <%= project_names_for_autocomplete %>, {choices:100,autoSelect:false});
-function selectDefaultContext() {
-  todoContextNameElement = $('<%= dom_id(@todo, 'context_name') %>');
-  defaultContextName = $('todo_context_name').projectDefaultContextsMap[this.value];
-  if (defaultContextName && !todoContextNameElement.editedByTracksUser) {
-    todoContextNameElement.value = defaultContextName;
+  <script type="text/javascript">
+  <%= dom_id(@todo, 'project_autocompleter') %> = new Autocompleter.Local('<%= dom_id(@todo, 'project_name') %>', '<%= dom_id(@todo, 'project_list') %>', <%= project_names_for_autocomplete %>, {choices:100,autoSelect:false});
+  function selectDefaultContext() {
+    todoContextNameElement = $('<%= dom_id(@todo, 'context_name') %>');
+    defaultContextName = $('todo_context_name').projectDefaultContextsMap[this.value];
+    if (defaultContextName && !todoContextNameElement.editedByTracksUser) {
+      todoContextNameElement.value = defaultContextName;
+    }
   }
-}
-Event.observe($('<%= dom_id(@todo, 'project_name') %>'), "focus", <%= dom_id(@todo, 'project_autocompleter') %>.activate.bind(<%= dom_id(@todo, 'project_autocompleter') %>));
-Event.observe($('<%= dom_id(@todo, 'project_name') %>'), "click", <%= dom_id(@todo, 'project_autocompleter') %>.activate.bind(<%= dom_id(@todo, 'project_autocompleter') %>));
-Event.observe($('<%= dom_id(@todo, 'project_name') %>'), "blur", selectDefaultContext.bind($('<%= dom_id(@todo, 'project_name') %>')));
-</script>
+  Event.observe($('<%= dom_id(@todo, 'project_name') %>'), "focus", <%= dom_id(@todo, 'project_autocompleter') %>.activate.bind(<%= dom_id(@todo, 'project_autocompleter') %>));
+  Event.observe($('<%= dom_id(@todo, 'project_name') %>'), "click", <%= dom_id(@todo, 'project_autocompleter') %>.activate.bind(<%= dom_id(@todo, 'project_autocompleter') %>));
+  Event.observe($('<%= dom_id(@todo, 'project_name') %>'), "blur", selectDefaultContext.bind($('<%= dom_id(@todo, 'project_name') %>')));
+  </script>
 </div>
 
 <div class="context_input">
-<label for="<%= dom_id(@todo, 'context_name') %>">Context</label>
-<input id="<%= dom_id(@todo, 'context_name') %>" name="context_name" autocomplete="off" tabindex="11" size="30" type="text" value="<%= @todo.context.name %>" />
-<div class="page_name_auto_complete" id="<%= dom_id(@todo, 'context_list') %>" style="display:none"></div>
+  <label for="<%= dom_id(@todo, 'context_name') %>">Context</label>
+  <input id="<%= dom_id(@todo, 'context_name') %>" name="context_name" autocomplete="off" tabindex="11" size="30" type="text" value="<%= @todo.context.name %>" />
+  <div class="page_name_auto_complete" id="<%= dom_id(@todo, 'context_list') %>" style="display:none"></div>
 
-<script type="text/javascript">
-<%= dom_id(@todo, 'context_autocompleter') %> = new Autocompleter.Local('<%= dom_id(@todo, 'context_name') %>', '<%= dom_id(@todo, 'context_list') %>', <%= context_names_for_autocomplete %>, {choices:100,autoSelect:false});
-Event.observe($('<%= dom_id(@todo, 'context_name') %>'), "focus", function(){ $('<%= dom_id(@todo, 'context_name') %>').editedByTracksUser = true; });
-Event.observe($('<%= dom_id(@todo, 'context_name') %>'), "focus", <%= dom_id(@todo, 'context_autocompleter') %>.activate.bind(<%= dom_id(@todo, 'context_autocompleter') %>));
-Event.observe($('<%= dom_id(@todo, 'context_name') %>'), "click", <%= dom_id(@todo, 'context_autocompleter') %>.activate.bind(<%= dom_id(@todo, 'context_autocompleter') %>));
-</script>
+  <script type="text/javascript">
+  <%= dom_id(@todo, 'context_autocompleter') %> = new Autocompleter.Local('<%= dom_id(@todo, 'context_name') %>', '<%= dom_id(@todo, 'context_list') %>', <%= context_names_for_autocomplete %>, {choices:100,autoSelect:false});
+  Event.observe($('<%= dom_id(@todo, 'context_name') %>'), "focus", function(){ $('<%= dom_id(@todo, 'context_name') %>').editedByTracksUser = true; });
+  Event.observe($('<%= dom_id(@todo, 'context_name') %>'), "focus", <%= dom_id(@todo, 'context_autocompleter') %>.activate.bind(<%= dom_id(@todo, 'context_autocompleter') %>));
+  Event.observe($('<%= dom_id(@todo, 'context_name') %>'), "click", <%= dom_id(@todo, 'context_autocompleter') %>.activate.bind(<%= dom_id(@todo, 'context_autocompleter') %>));
+  </script>
 </div>
 
 <label class="tag_list_label" for="<%= dom_id(@todo, 'tag_list') %>">Tags (separate with commas)</label>
 <%= text_field_tag 'tag_list', tag_list_text, :id => dom_id(@todo, 'tag_list'), :size => 30, :tabindex => 12 %> 
 
 <div class="due_input">
-<label for="<%= dom_id(@todo, 'due_label') %>">Due</label>
-<%= date_field_tag("todo[due]", dom_id(@todo, 'due'), format_date(@todo.due), "tabindex" => 13) %>
-<a href="#" id="<%= dom_id(@todo, 'due_x') %>" class="date_clear" title="Clear due date">
-	<%= image_tag("delete_off.png", :alt => "Clear due date") %>
-</a>
+  <label for="<%= dom_id(@todo, 'due_label') %>">Due</label>
+  <%= date_field_tag("todo[due]", dom_id(@todo, 'due'), format_date(@todo.due), "tabindex" => 13) %>
+  <a href="#" id="<%= dom_id(@todo, 'due_x') %>" class="date_clear" title="Clear due date">
+    <%= image_tag("delete_off.png", :alt => "Clear due date") %>
+  </a>
 </div>
 
 <div class="show_from_input">
-<label for="<%= dom_id(@todo, 'show_from') %>">Show from</label>
-<%= date_field_tag("todo[show_from]", dom_id(@todo, 'show_from'), format_date(@todo.show_from), "tabindex" => 14) %>
-<a href="#" id="<%= dom_id(@todo, 'show_from_x') %>" class="date_clear" title="Clear show from date">
-	<%= image_tag("delete_off.png", :alt => "Clear show from date") %>
-</a>
+  <label for="<%= dom_id(@todo, 'show_from') %>">Show from</label>
+  <%= date_field_tag("todo[show_from]", dom_id(@todo, 'show_from'), format_date(@todo.show_from), "tabindex" => 14) %>
+  <a href="#" id="<%= dom_id(@todo, 'show_from_x') %>" class="date_clear" title="Clear show from date">
+    <%= image_tag("delete_off.png", :alt => "Clear show from date") %>
+  </a>
 </div>
 
 <% if controller.controller_name == "project" || @todo.deferred? -%>
@@ -69,15 +69,23 @@ Event.observe($('<%= dom_id(@todo, 'context_name') %>'), "click", <%= dom_id(@to
 <div class="submit_box">
   <div class="widgets">
     <button type="submit" class="positive" id="<%= dom_id(@todo, 'submit') %>" tabindex="15">
-        <%=image_tag("accept.png", :alt => "") %>
-        Update
+      <%=image_tag("accept.png", :alt => "") %>
+      Update
     </button>
     <a href="javascript:void(0);" onclick="Element.toggle('<%= dom_id(@todo, 'line') %>');Element.toggle('<%= dom_id(@todo, 'edit') %>');" class="negative">
-        <%=image_tag("cancel.png", :alt => "") %>
-        Cancel
+      <%=image_tag("cancel.png", :alt => "") %>
+      Cancel
     </a>
   </div>
 </div>
-        
+
 <%= calendar_setup( dom_id(@todo, 'due') ) %>
 <%= calendar_setup( dom_id(@todo, 'show_from') ) %>
+
+<script>
+  jQuery(function(){ 
+    jQuery(".date_clear").click(function() {
+      /* add behavior to clear the date both buttons for show_from and due */
+      jQuery(this).prev().val('');
+    })})
+</script>
\ No newline at end of file
diff --git a/app/views/todos/_todo.html.erb b/app/views/todos/_todo.html.erb
index 629273e6..321244cb 100644
--- a/app/views/todos/_todo.html.erb
+++ b/app/views/todos/_todo.html.erb
@@ -38,4 +38,3 @@ parameters += "&_tag_name=#{@tag_name}" if @source_view == 'tag'
     <% end -%>
   </div>
 </div>
-<%=  apply_behaviour ".date_clear:click","var selector_x = this.getAttribute('id').replace('_x', ''); $(selector_x).value='';" %>