diff --git a/app/controllers/todos_controller.rb b/app/controllers/todos_controller.rb
index 4af89453..030b9345 100644
--- a/app/controllers/todos_controller.rb
+++ b/app/controllers/todos_controller.rb
@@ -784,17 +784,8 @@ class TodosController < ApplicationController
     @source_view = params['_source_view'] || 'calendar'
     @page_title = t('todos.calendar_page_title')
 
-    calendar = Todos::Calendar.new(current_user)
-    @projects = calendar.projects
-
-    due_this_month_date = Time.zone.now.end_of_month
-    included_tables = Todo::DEFAULT_INCLUDES
-
-    @due_today = calendar.due_today
-    @due_this_week = calendar.due_this_week
-    @due_next_week = calendar.due_next_week
-    @due_this_month = calendar.due_this_month
-    @due_after_this_month = calendar.due_after_this_month
+    @calendar = Todos::Calendar.new(current_user)
+    @projects = @calendar.projects
     @count = current_user.todos.not_completed.are_due.count
 
     respond_to do |format|
diff --git a/app/views/todos/calendar.html.erb b/app/views/todos/calendar.html.erb
index 04539567..59096af9 100644
--- a/app/views/todos/calendar.html.erb
+++ b/app/views/todos/calendar.html.erb
@@ -1,10 +1,10 @@
 <div id="display_box">
 
-  <%= todos_calendar_container(:due_today,            @due_today           ) %>
-  <%= todos_calendar_container(:due_this_week,        @due_this_week       ) %>
-  <%= todos_calendar_container(:due_next_week,        @due_next_week       ) %>
-  <%= todos_calendar_container(:due_this_month,       @due_this_month      ) %>
-  <%= todos_calendar_container(:due_after_this_month, @due_after_this_month) %>
+  <%= todos_calendar_container(:due_today,            @calendar.due_today           ) %>
+  <%= todos_calendar_container(:due_this_week,        @calendar.due_this_week       ) %>
+  <%= todos_calendar_container(:due_next_week,        @calendar.due_next_week       ) %>
+  <%= todos_calendar_container(:due_this_month,       @calendar.due_this_month      ) %>
+  <%= todos_calendar_container(:due_after_this_month, @calendar.due_after_this_month) %>
 
 </div><!-- End of display_box -->
 <div class="input_box" id="input_box">
diff --git a/test/functional/todos_controller_test.rb b/test/functional/todos_controller_test.rb
index 1e7afa75..4222d981 100644
--- a/test/functional/todos_controller_test.rb
+++ b/test/functional/todos_controller_test.rb
@@ -916,10 +916,10 @@ class TodosControllerTest < ActionController::TestCase
 
     assert_equal "calendar", assigns['source_view']
     assert_equal projects, assigns['projects']
-    assert_equal due_today, assigns['due_today']
-    assert_equal [], assigns['due_this_week']
-    assert_equal due_next_week, assigns['due_next_week']
-    assert_equal [], assigns['due_this_month']
+    assert_equal due_today, assigns['calendar'].due_today
+    assert_equal [], assigns['calendar'].due_this_week
+    assert_equal due_next_week, assigns['calendar'].due_next_week
+    assert_equal [], assigns['calendar'].due_this_month
     assert_equal 8, assigns['count']
   end
 end