--- a/calendarui/caleneditor/src/caleneditorreminderfield.cpp	Mon Aug 09 18:30:52 2010 +0530
+++ b/calendarui/caleneditor/src/caleneditorreminderfield.cpp	Wed Aug 25 14:02:13 2010 +0530
@@ -205,13 +205,6 @@
 			if (pastEvent && mReminderTimeAdded) {
 				mCustomReminderTimeItem->setEnabled(false);
 			}
-			QStringList reminderChoicesForAllDay;
-			reminderChoicesForAllDay << hbTrId("txt_calendar_setlabel_reminder_val_off") 
-					<< hbTrId("txt_calendar_setlabel_reminder_val_on_event_day")
-					<< hbTrId("txt_calendar_setlabel_reminder_val_1_day_before")
-					<< hbTrId("txt_calendar_setlabel_reminder_val_2_days_before");
-			mReminderItem->setContentWidgetData(QString("items"),
-			                                    reminderChoicesForAllDay);
 			QTime referenceTime(0, 0, 0);
 			// Set the appropriate reminder depending on the value of time offset.
 			reminder = mCalenEditor->editedEntry()->alarm();
@@ -220,7 +213,7 @@
 				mReminderItem->setContentWidgetData("currentIndex", ReminderOnEventDay);
 				mReminderTimeForAllDay = referenceTime.addSecs(-(offsetInMins
 						* 60));
-			} else if (offsetInMins < numberOfMinutesInADay) {
+			} else if (offsetInMins <= numberOfMinutesInADay) {
 				mReminderItem->setContentWidgetData("currentIndex", ReminderOneDayBefore);
 				mReminderTimeForAllDay = referenceTime.addSecs(-(offsetInMins
 						* 60));
@@ -549,6 +542,8 @@
 {
 	OstTraceFunctionEntry0( CALENEDITORREMINDERFIELD_REMOVEREMINDERTIMEFIELD_ENTRY );
 	mReminderTimeAdded = false;
+	mEditorForm->removeConnection(mCustomReminderTimeItem, SIGNAL(clicked()),
+		                           this, SLOT(launchReminderTimePicker()));
 	if (mCustomReminderTimeItem) {
 		QModelIndex reminderIndex =
 				mCalenEditorModel->indexFromItem(mCustomReminderTimeItem);