diff --git a/contrib/openldap/core-fd.schema b/contrib/openldap/core-fd.schema
index 8b0eb33f9b321b9679ef65c5bb1e35b3cafd6663..b3b3a29dfb2b59b5438b5c79657aa0e964d5e56a 100644
--- a/contrib/openldap/core-fd.schema
+++ b/contrib/openldap/core-fd.schema
@@ -293,6 +293,19 @@ attributetype ( 1.3.6.1.4.1.38414.89.1.1 NAME 'fdTasksMailObject'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE )
 
+attributetype ( 1.3.6.1.4.1.38414.89.1.2 NAME 'fdTasksSchedule'
+	DESC 'Scheduling of the Task - required processed date'
+	EQUALITY generalizedTimeMatch
+	ORDERING generalizedTimeOrderingMatch
+	SINGLE-VALUE
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )
+
+attributetype ( 1.3.6.1.4.1.38414.89.1.3 NAME 'fdTasksMailUsers'
+  DESC 'Fusion Directory - Tasks Mail Users Recipient'
+  EQUALITY caseExactMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  SINGLE-VALUE )
+
 ##### Classes #####
 
 objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.4 NAME 'gosaDepartment' SUP top AUXILIARY
@@ -380,10 +393,10 @@ objectclass ( 1.3.6.1.4.1.38414.88.2.5 NAME 'fdMailTemplateInvitations'
 objectclass (1.3.6.1.4.1.38414.89.2.1 NAME 'fdTasks'
   DESC 'FusionDirectory - Tasks objects'
   MUST ( cn )
-  MAY ( ) )
+  MAY ( fdTasksSchedule ) )
 
 objectclass (1.3.6.1.4.1.38414.89.2.2 NAME 'fdTasksMail'
   DESC 'FusionDirectory - Tasks objects Mail'
   SUP top AUXILIARY
   MUST ( cn )
-  MAY ( fdTasksMailObject ) )
+  MAY ( fdTasksMailObject $ fdTasksMailUsers) )
diff --git a/plugins/addons/tasks/class_tasks.inc b/plugins/addons/tasks/class_tasks.inc
index adada3bc6fea0bfe47c1b8eb339c477639c9acd8..46c510688bb2b7eda028ec25acf55cb66a12b0d5 100644
--- a/plugins/addons/tasks/class_tasks.inc
+++ b/plugins/addons/tasks/class_tasks.inc
@@ -51,6 +51,11 @@ class tasks extends simplePlugin
           _('Task Name'), _('Name for this task'),
           'cn', TRUE
         ),
+        new GeneralizedTimeDateAttribute(
+          _('Task Schedule'), _('Date when this task is required to be processed'),
+          'fdTasksSchedule', FALSE,
+          ''
+        ),
         ]
       ],
     ];
diff --git a/plugins/addons/tasks/class_tasksMail.inc b/plugins/addons/tasks/class_tasksMail.inc
index 5ba92c35b10275e4ba722112adb5ade3ec6f4107..ffde949637a4ba6dc235ea9d21cc0828c9af5b30 100644
--- a/plugins/addons/tasks/class_tasksMail.inc
+++ b/plugins/addons/tasks/class_tasksMail.inc
@@ -56,6 +56,16 @@ class tasksMail extends simplePlugin
         ),
         ]
       ],
+      'UserGroupSelection' => [
+        'name'  => _('Users and/or Groups'),
+        'attrs' => [
+          new GroupMembersAttribute(
+            '', _('Select Users/Groups'),
+            'fdTasksMailUsers', TRUE,
+            [], 'cn'
+          )
+        ]
+        ],
     ];
   }
 
@@ -64,7 +74,7 @@ class tasksMail extends simplePlugin
     global $config;
     parent::__construct($dn, $object, $parent, $mainTab);
 
-    //Search within LDAP and retrieve all mail objects
+    //Search within LDAP and retrieve all mail objects for current base.
     $ldap = $config->get_ldap_link();
     $ldap->cd($config->current['BASE']);
     $ldap->search('(&(objectClass=fdMailTemplate))', ['cn']);