--- a/calendarui/agendaeventviewer/src/agendaeventview.cpp	Mon Sep 20 12:44:39 2010 +0530
+++ b/calendarui/agendaeventviewer/src/agendaeventview.cpp	Tue Oct 05 13:57:00 2010 +0530
@@ -1172,7 +1172,9 @@
 			this, SLOT(close()));
 
 	window->removeView(mViewer);
-	if (AgendaEntry::TypeTodo == mAgendaEntry.type()) {
+	// For To-do, if due date is in future, we retain it there. 
+	// All the past incompleted to-dos will come on today.
+	if ((AgendaEntry::TypeTodo == mAgendaEntry.type()) && (mAgendaEntry.startTime().date() <= QDate::currentDate())) {
 	    mAgendaEntry.setStartAndEndTime(
 	            CalenDateUtils::today(), CalenDateUtils::today());
 	}