diff --git a/lib/classes/phpmailer/class.PHPMailer.php b/lib/classes/phpmailer/class.PHPMailer.php
index fe37a93b..29ec3118 100644
--- a/lib/classes/phpmailer/class.PHPMailer.php
+++ b/lib/classes/phpmailer/class.PHPMailer.php
@@ -571,9 +571,12 @@ class PHPMailer
     {
         $this->exceptions = ($exceptions == true);
         //Make sure our autoloader is loaded
-        if (!in_array('PHPMailerAutoload', spl_autoload_functions())) {
-            require 'PHPMailerAutoload.php';
-        }
+/*
+ * commented out for Froxlor as we have our own Autoloader to take care of this stuff
+ */
+//        if (!in_array('PHPMailerAutoload', spl_autoload_functions())) {
+//            require 'PHPMailerAutoload.php';
+//        }
     }
 
     /**