diff --git a/composer.json b/composer.json
index 42b89a111..136a00ab5 100644
--- a/composer.json
+++ b/composer.json
@@ -59,6 +59,7 @@
             "thirdparty/pear",
             "thirdparty/html2ps_pdf",
             "thirdparty/phing",
+            "thirdparty/phpmailer",
             "rbac/engine/classes/"
         ],
         "files": [
diff --git a/workflow/engine/classes/class.actionsByEmailCore.php b/workflow/engine/classes/class.actionsByEmailCore.php
index aeaede0fd..0a1cea35f 100644
--- a/workflow/engine/classes/class.actionsByEmailCore.php
+++ b/workflow/engine/classes/class.actionsByEmailCore.php
@@ -84,8 +84,6 @@ class actionsByEmailCoreClass extends PMPlugin
                 $emailServer->getEmailServerDefault();
 
             if (!empty($emailSetup)) {
-                require_once 'classes/model/AbeConfiguration.php';
-
                 $cases = new Cases();
                 $caseFields = $cases->loadCase($data->APP_UID);
                 $criteria = new Criteria();
@@ -113,8 +111,6 @@ class actionsByEmailCoreClass extends PMPlugin
                     if ($configuration['ABE_EMAIL_FIELD'] != '' && isset($caseFields['APP_DATA'][$configuration['ABE_EMAIL_FIELD']])) {
                         $email = trim($caseFields['APP_DATA'][$configuration['ABE_EMAIL_FIELD']]);
                     } else {
-                        require_once 'classes/model/Users.php';
-
                         $userInstance = new Users();
                         $userInfo     = $userInstance->getAllInformation($data->USR_UID);
                         $email        = $userInfo['mail'];
@@ -126,9 +122,6 @@ class actionsByEmailCoreClass extends PMPlugin
                             $subject = $caseFields['APP_TITLE'];
                         }
 
-                        // Create
-                        require_once 'classes/model/AbeRequests.php';
-
                         $abeRequest = array();
                         $abeRequest['ABE_REQ_UID']      = '';
                         $abeRequest['ABE_UID']          = $configuration['ABE_UID'];