diff --git a/SoObjects/Appointments/product.plist b/SoObjects/Appointments/product.plist
index 8692cfd8d..cdbdeaea7 100644
--- a/SoObjects/Appointments/product.plist
+++ b/SoObjects/Appointments/product.plist
@@ -11,6 +11,7 @@
     SOGoAppointmentFolder = {
       superclass    = "SOGoFolder";
     };
+
     SOGoGroupAppointmentFolder = {
       superclass    = "SOGoAppointmentFolder";
     };
@@ -19,6 +20,10 @@
       superclass    = "SOGoContentObject";
     };
 
+    SOGoTaskObject = {
+      superclass    = "SOGoContentObject";
+    };
+
     SOGoFreeBusyObject = {
       superclass    = "SOGoContentObject";
     };
diff --git a/UI/Scheduler/Toolbars/SOGoAppointmentFolder.toolbar b/UI/Scheduler/Toolbars/SOGoAppointmentFolder.toolbar
index 74093e5d2..ceca26f96 100644
--- a/UI/Scheduler/Toolbars/SOGoAppointmentFolder.toolbar
+++ b/UI/Scheduler/Toolbars/SOGoAppointmentFolder.toolbar
@@ -2,11 +2,12 @@
   ( { link = "#";
       isSafe = NO;
       label = "New Event";
-      onclick = "return newEvent(this);";
+      onclick = "return newEvent(this, 'event');";
       image = "new-event.png"; },
     { link  = "new_task";
-      enabled = "NO";
       label="New Task";
+      image = "new-task.png";
+      onclick = "return newEvent(this, 'task');";
       image = "new-task.png"; },
     { link  = "edit";
       label="Edit";
diff --git a/UI/Scheduler/product.plist b/UI/Scheduler/product.plist
index ad87c3cbd..bafcc67d3 100644
--- a/UI/Scheduler/product.plist
+++ b/UI/Scheduler/product.plist
@@ -49,6 +49,10 @@
           protectedBy = "View";
           pageName    = "UIxCalAptListView"; 
         };
+        taskslist = {
+          protectedBy = "View";
+          pageName    = "UIxCalTasksListView"; 
+        };
         dayview = {
           protectedBy = "View";
           pageName    = "UIxCalDayView"; 
@@ -74,10 +78,6 @@
           protectedBy = "View";
           pageName    = "UIxCalDayListview"; 
         };
-        dayprintview = { 
-          protectedBy = "View";
-          pageName    = "UIxCalDayPrintview"; 
-        };
         weekoverview = { 
           protectedBy = "View";
           pageName    = "UIxCalWeekOverview"; 
@@ -94,27 +94,24 @@
           protectedBy = "View";
           pageName    = "UIxCalWeekColumnsview"; 
         };
-        weekprintview = { 
-          protectedBy = "View";
-          pageName    = "UIxCalWeekPrintview"; 
-        };
         monthoverview = { 
           protectedBy = "View";
           pageName    = "UIxCalMonthOverview"; 
         };
-        monthprintview = { 
-          protectedBy = "View";
-          pageName    = "UIxCalMonthPrintview"; 
-        };
         yearoverview = { 
           protectedBy = "View";
           pageName    = "UIxCalYearOverview"; 
         };
-        new = { 
+        newevent = { 
           protectedBy = "View";
           pageName    = "UIxAppointmentEditor"; 
           actionName  = "new";
         };
+        newtask = { 
+          protectedBy = "View";
+          pageName    = "UIxTaskEditor"; 
+          actionName  = "new";
+        };
         show = { 
           protectedBy = "View";
           pageName    = "UIxCalView"; 
@@ -134,10 +131,6 @@
 
     SOGoAppointmentObject = {
       methods = {
-        printview = { 
-          protectedBy = "View";
-          pageName    = "UIxAppointmentPrintview"; 
-        };
         view = { 
           protectedBy = "View";
           pageName    = "UIxAppointmentView"; 
@@ -151,11 +144,20 @@
           protectedBy = "View";
           pageName    = "UIxAppointmentEditor"; 
         };
+        editAsAppointment = { 
+          protectedBy = "View";
+          pageName    = "UIxAppointmentEditor"; 
+        };
         save = { 
           protectedBy = "View";
           pageName    = "UIxAppointmentEditor"; 
           actionName  = "save";
         };
+        saveAsAppointment = {
+          protectedBy = "View";
+          pageName    = "UIxAppointmentEditor"; 
+          actionName  = "save";
+        };
         accept = { 
           protectedBy = "View";
           pageName    = "UIxAppointmentEditor"; 
@@ -173,5 +175,57 @@
         };
       };
     };
+
+    SOGoTaskObject = {
+      methods = {
+        view = { 
+          protectedBy = "View";
+          pageName    = "UIxTaskView"; 
+        };
+        delete = { 
+          protectedBy = "View";
+          pageName    = "UIxTaskView"; 
+          actionName  = "delete";
+        };
+        edit = { 
+          protectedBy = "View";
+          pageName    = "UIxTaskEditor"; 
+        };
+        editAsTask = { 
+          protectedBy = "View";
+          pageName    = "UIxTaskEditor"; 
+        };
+        save = { 
+          protectedBy = "View";
+          pageName    = "UIxTaskEditor"; 
+          actionName  = "save";
+        };
+        saveAsTask = { 
+          protectedBy = "View";
+          pageName    = "UIxTaskEditor"; 
+          actionName  = "save";
+        };
+        changeStatus = {
+          protectedBy = "View";
+          pageName    = "UIxTaskEditor"; 
+          actionName  = "changeStatus";
+        };
+        accept = { 
+          protectedBy = "View";
+          pageName    = "UIxTaskEditor"; 
+          actionName  = "accept";
+        };
+        decline = { 
+          protectedBy = "View";
+          pageName    = "UIxTaskEditor"; 
+          actionName  = "decline";
+        };
+        test = { 
+          protectedBy = "View";
+          pageName    = "UIxTaskEditor"; 
+          actionName  = "test";
+        };
+      };
+    };
   };
 }