diff --git a/src/FusionDirectory/Mail/MailLib.php b/src/FusionDirectory/Mail/MailLib.php
index af42adfa28f7442275f9f4512f552d447e4e905f..e25450b280b03c3a804010e174a7d0c21916fdbe 100644
--- a/src/FusionDirectory/Mail/MailLib.php
+++ b/src/FusionDirectory/Mail/MailLib.php
@@ -1,10 +1,12 @@
 <?php
 
+namespace FusionDirectory\Mail;
+
 use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\SMTP;
 use PHPMailer\PHPMailer\Exception;
 
-class MailController
+class MailLib
 {
 
   protected string  $setFrom;
@@ -100,7 +102,7 @@ class MailController
       try {
         $this->mail->send();
 
-      } catch (Exception $e) {
+      } catch (\Exception $e) {
         $errors[] = $this->mail->ErrorInfo;
 
       }
diff --git a/src/autoloader.php b/src/autoloader.php
index 97f858f35ddd4e065611d76f8e98a72c1ce3b0b0..c291451f11fb08448081ab61b7f510de028f9c21 100644
--- a/src/autoloader.php
+++ b/src/autoloader.php
@@ -10,6 +10,12 @@ spl_autoload_register(function ($class) {
   // Simple array to keep track of which classes have already been loaded.
   static $classes = [];
 
+  if (strpos($class, 'PHPMailer') !== FALSE) {
+    require_once("/usr/share/php/libphp-phpmailer/src/Exception.php");
+    require_once("/usr/share/php/libphp-phpmailer/src/PHPMailer.php");
+    require_once("/usr/share/php/libphp-phpmailer/src/SMTP.php");
+  }
+
   // Avoids re-loading classes that have already been loaded.
   if (array_key_exists($class, $classes)) {
     return;