diff --git a/ChangeLog b/ChangeLog
index a8dc03aba..429a2362b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-12-22  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/Scheduler/UIxTaskEditor.m (-takeValuesFromRequest:inContext:): remove alarms
+	when no start date is defined.
+
+	* UI/WebServerResources/UIxTaskEditor.js (onTimeControlCheck):
+	disable the reminder popup menu when no start date is defined.
+
 2011-12-15  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* SoObjects/SOGo/SOGoSieveManager.m - slightly reworked
diff --git a/NEWS b/NEWS
index 665af3526..27e17967a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+1.3-YYYYMMDD (1.3.12)
+---------------------
+New Features
+ - 
+
+Enhancements
+ - updated Ukrainian translation
+
+Bug Fixes
+ - alarms for tasks now depend on the start date and instead of the due date
+
 1.3-20111212 (1.3.11)
 ---------------------
 New Features
diff --git a/SoObjects/SOGo/SOGoDefaults.plist b/SoObjects/SOGo/SOGoDefaults.plist
index e56b05cf3..296024c62 100644
--- a/SoObjects/SOGo/SOGoDefaults.plist
+++ b/SoObjects/SOGo/SOGoDefaults.plist
@@ -37,7 +37,7 @@
                                "SpanishSpain", "SpanishArgentina", "French", "German",
                                "Icelandic", "Italian", "Hungarian", "BrazilianPortuguese",
                                "NorwegianBokmal", "NorwegianNynorsk", "Polish", "Russian",
-                               "Ukrainian", "Swedish");
+                               "Ukrainian", "Swedish" );
 
     SOGoTimeZone = "UTC";
     SOGoDayStartTime = "8";
diff --git a/SoObjects/SOGo/WOResourceManager+SOGo.m b/SoObjects/SOGo/WOResourceManager+SOGo.m
index 79a112785..37c2bc665 100644
--- a/SoObjects/SOGo/WOResourceManager+SOGo.m
+++ b/SoObjects/SOGo/WOResourceManager+SOGo.m
@@ -34,6 +34,8 @@
   static Class MainProduct = Nil;
   NSString *lpath;
 
+#warning TODO: create method "languagesBeginingWith:"
+
   lpath = [self pathForResourceNamed: @"Locale"
 			 inFramework: nil
 			   languages: [NSArray arrayWithObject:_name]];
diff --git a/UI/Scheduler/UIxTaskEditor.m b/UI/Scheduler/UIxTaskEditor.m
index 8d07b7d3f..426e4ee1b 100644
--- a/UI/Scheduler/UIxTaskEditor.m
+++ b/UI/Scheduler/UIxTaskEditor.m
@@ -511,15 +511,15 @@
   if (hasStartDate)
     [todo setStartDate: taskStartDate];
   else
-    [todo setStartDate: nil];
+    {
+      [todo setStartDate: nil];
+      [todo removeAllAlarms];
+    }
 
   if (hasDueDate)
     [todo setDue: taskDueDate];
   else
-    {
       [todo setDue: nil];
-      [todo removeAllAlarms];
-    }
 
   if ([status isEqualToString: @"COMPLETED"])
     [todo setCompleted: statusDate];
diff --git a/UI/WebServerResources/UIxTaskEditor.js b/UI/WebServerResources/UIxTaskEditor.js
index 3c7d8b36a..84eab59bb 100644
--- a/UI/WebServerResources/UIxTaskEditor.js
+++ b/UI/WebServerResources/UIxTaskEditor.js
@@ -178,7 +178,7 @@ function onTimeControlCheck(checkBox) {
         for (var i = 0; i < selects.length; i++)
             if (selects[i] != checkBox)
                 selects[i].disabled = !checkBox.checked;
-	if (checkBox.id == "dueDateCB")
+	if (checkBox.id == "startDateCB")
             $("reminderList").disabled = !checkBox.checked;
     }
 }
@@ -323,7 +323,7 @@ function onTaskEditorLoad() {
     }
 
     // Enable or disable the reminder list
-    onTimeControlCheck($("dueDateCB"));
+    onTimeControlCheck($("startDateCB"));
 
     initializeStatusLine();
 }