diff --git a/plugins/management/mailtemplate/.class_mailTemplateManagement.inc.swp b/plugins/management/mailtemplate/.class_mailTemplateManagement.inc.swp
deleted file mode 100644
index 129eae9eea882410d9f5b607b915db5d4ddd53ed..0000000000000000000000000000000000000000
Binary files a/plugins/management/mailtemplate/.class_mailTemplateManagement.inc.swp and /dev/null differ
diff --git a/plugins/management/tasks/class_tasksManagement.inc b/plugins/management/tasks/class_tasksManagement.inc
new file mode 100644
index 0000000000000000000000000000000000000000..360bdc03d716ab9a5384c592b81d5a3dcd9f1850
--- /dev/null
+++ b/plugins/management/tasks/class_tasksManagement.inc
@@ -0,0 +1,59 @@
+<?php
+/*
+  This code is part of FusionDirectory (http://www.fusiondirectory.org/)
+  Copyright (C) 2011-2022  FusionDirectory
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+*/
+
+class tasksManagement extends management
+{
+
+  protected $skipCpHandler    = TRUE;
+
+  /*
+  *  LinkColumn exists by class column
+  *  TasksColumn is a new class for Tasks based on argonaut column definition
+  */
+  public static $columns = [
+    //below fdTasksMailObject must be changed to have a type defined within task creation (new ldap attributes ?hidden)
+    ['LinkColumn',  ['attributes' => 'cn', 'label' => 'Tasks']],
+    ['TasksColumn', ['attributes' => 'fdTasksMailObject', 'label' => 'Types']],
+    ['Column', ['attributes' => 'fdTasksCreationDate', 'label' => 'Creation Date']],
+    ['TasksColumn', ['attributes' => 'fdTasksScheduleDate', 'label' => 'Scheduled']],
+    ['ActionsColumn', ['label' => 'Actions']],
+  ];
+
+  static function plInfo ()
+  {
+    return [
+      'plShortName'   => _('Tasks'),
+      'plDescription' => _('Provide a mechanism to create and manage tasks'),
+      'plTitle'       => _('Tasks'),
+      'plIcon'        => 'geticon.php?context=applications&icon=tasks&size=48',
+      'plSection'     => 'workflow',
+      'plPriority'    => 2,
+      'plManages'     => ['tasks'],
+      'plProvidedAcls' => [],
+    ];
+  }
+
+  protected function setUpListing ()
+  {
+    /* Set baseMode to FALSE */
+    $this->listing  = new managementListing($this, FALSE);
+  }
+
+}