diff --git a/plugins/tasklist/drivers/database/tasklist_database_driver.php b/plugins/tasklist/drivers/database/tasklist_database_driver.php
index fe2733cb..ae2b5e25 100644
--- a/plugins/tasklist/drivers/database/tasklist_database_driver.php
+++ b/plugins/tasklist/drivers/database/tasklist_database_driver.php
@@ -656,7 +656,7 @@ class tasklist_database_driver extends tasklist_driver
     private function _get_notification($task)
     {
         if ($task['alarms'] && $task['complete'] < 1 || strpos($task['alarms'], '@') !== false) {
-            $alarm = libcalendaring::get_next_alarm($task);
+            $alarm = libcalendaring::get_next_alarm($task, 'task');
 
         if ($alarm['time'] && $alarm['action'] == 'DISPLAY')
           return date('Y-m-d H:i:s', $alarm['time']);
diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index f3c26fd9..7a104844 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -100,7 +100,6 @@ function rcube_tasklist_ui(settings)
     var Q = this.quote_html;
     var text2html = this.text2html;
     var event_date_text = this.event_date_text;
-    var format_datetime = this.format_datetime;
     var parse_datetime = this.parse_datetime;
     var date2unixtime = this.date2unixtime;
     var fromunixtime = this.fromunixtime;
@@ -1019,8 +1018,8 @@ function rcube_tasklist_ui(settings)
               if (alarm[0].match(/@(\d+)/)) {
                   var ondate = fromunixtime(parseInt(RegExp.$1));
                   $('#taskedit select.edit-alarm-offset').val('@');
-                  $('#taskedit input.edit-alarm-date').val(format_datetime(ondate, 1));
-                  $('#taskedit input.edit-alarm-time').val(format_datetime(ondate, 2));
+                  $('#taskedit input.edit-alarm-date').val(me.format_datetime(ondate, 1));
+                  $('#taskedit input.edit-alarm-time').val(me.format_datetime(ondate, 2));
               }
               else if (alarm[0].match(/([-+])(\d+)([MHD])/)) {
                   $('#taskedit input.edit-alarm-value').val(RegExp.$2);