diff --git a/contrib/openldap/core-fd.schema b/contrib/openldap/core-fd.schema
index 276784c4da848633adcdeb7693aca66b41a8921c..45f16705ee579722baf98db9ad2a9c2cc61e6315 100644
--- a/contrib/openldap/core-fd.schema
+++ b/contrib/openldap/core-fd.schema
@@ -320,7 +320,12 @@ attributetype ( 1.3.6.1.4.1.38414.89.1.6 NAME 'fdTasksCreationDate'
   EQUALITY caseExactMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
 
-attributetype ( 1.3.6.1.4.1.38414.89.1.7 NAME 'fdTasksEmailsFromdDN'
+attributetype ( 1.3.6.1.4.1.38414.89.1.7 NAME 'fdTasksEmailsFromDN'
+  DESC 'Fusion Directory - Emails derived from DN' 
+  EQUALITY caseExactMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+
+attributetype ( 1.3.6.1.4.1.38414.89.1.8 NAME 'fdTasksEmailSender'
   DESC 'Fusion Directory - Emails derived from DN' 
   EQUALITY caseExactMatch
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
@@ -417,5 +422,5 @@ objectclass (1.3.6.1.4.1.38414.89.2.1 NAME 'fdTasks'
 objectclass (1.3.6.1.4.1.38414.89.2.2 NAME 'fdTasksMail'
   DESC 'FusionDirectory - Tasks objects Mail'
   SUP top AUXILIARY
-  MUST ( fdTasksMailObject ) 
-  MAY ( fdTasksMailUsers $ fdTasksEmailsFromdDN ) )
+  MUST ( fdTasksMailObject $ fdTasksEmailSender ) 
+  MAY ( fdTasksMailUsers $ fdTasksEmailsFromDN ) )
diff --git a/plugins/addons/tasks/class_tasksMail.inc b/plugins/addons/tasks/class_tasksMail.inc
index 56f4e3d335d4e17606cee00809ac82d8b0a8e4b7..ad59f953d5ed8c12ec8e5967501dc27a2a326c95 100644
--- a/plugins/addons/tasks/class_tasksMail.inc
+++ b/plugins/addons/tasks/class_tasksMail.inc
@@ -55,11 +55,19 @@ class tasksMail extends simplePlugin
             _('Mail Template'), _('Mail Template Object Selection'),
             'fdTasksMailObject', FALSE
           ),
-          new HiddenArrayAttribute('fdTasksEmailsFromdDN', FALSE, ''),
+          new HiddenArrayAttribute('fdTasksEmailsFromDN', FALSE, ''),
           ]
       ],
+      'From Component' => [
+        'name'  => _('Sender Address'),
+        'attrs' => [
+           new MailAttribute(
+             _('Sender email address'),
+             _('Email address from which mails will be sent'), 'fdTasksEmailSender', TRUE, 'to.be@chang.ed'),
+        ]
+      ],
       'UserGroupSelection' => [
-        'name'  => _('Users and/or Groups'),
+        'name'  => _('Recipients Users and/or Groups'),
         'attrs' => [
           new GroupMembersAttribute(
             '', _('Select Users/Groups'),
@@ -129,7 +137,7 @@ class tasksMail extends simplePlugin
           $mailList[] = $info["mail"][0];
         }
       }
-      $this->attributesAccess['fdTasksEmailsFromdDN']->setValue(array_values($mailList));
+      $this->attributesAccess['fdTasksEmailsFromDN']->setValue(array_values($mailList));
       print_r($mailList);
     }
   }