diff --git a/tracks/app/controllers/feed_controller.rb b/tracks/app/controllers/feed_controller.rb
index 2c965c68..ef8b7b35 100644
--- a/tracks/app/controllers/feed_controller.rb
+++ b/tracks/app/controllers/feed_controller.rb
@@ -127,6 +127,7 @@ protected
     end
   
     options[:conditions] = condition_builder.to_conditions
+    options[:order] = "todos.due IS NULL, todos.due ASC, todos.created_at ASC"
     options[:include] = :project
     
     @todos = @user.todos.find(:all, options )
diff --git a/tracks/app/helpers/feed_helper.rb b/tracks/app/helpers/feed_helper.rb
index 6bdc4a5e..6be2de4c 100644
--- a/tracks/app/helpers/feed_helper.rb
+++ b/tracks/app/helpers/feed_helper.rb
@@ -11,7 +11,7 @@ module FeedHelper
       if item.context_id == context.id
         result_string << "\n" + context.name.upcase + ":\n" if result_string.empty?
       
-        if item.completed
+        if (item.done == 1 || item.done == true) && item.completed
           result_string << "    [Completed: " + format_date(item.completed) + "] "
         end