diff --git a/app/config/mail.conf.dist.php b/app/config/mail.conf.dist.php
index ed12761dfa..c7289fa712 100644
--- a/app/config/mail.conf.dist.php
+++ b/app/config/mail.conf.dist.php
@@ -8,7 +8,7 @@
 
 $platform_email['SMTP_FROM_EMAIL'] = ''; //See the function __construct() in main/inc/lib/notification.lib.php for more details on how the SMTP FROM email is defined and what to indicate here if needed to override users configuration
 $platform_email['SMTP_FROM_NAME'] = '';
-$platform_email['SMTP_HOST'] = 'localhost';
+$platform_email['SMTP_HOST'] = 'localhost'; // If using SMTP use the domain name example: mywebmail.example.net
 $platform_email['SMTP_PORT'] = 25;
 $platform_email['SMTP_MAILER'] = 'mail'; // mail, sendmail or smtp (Windows probably only supports smtp)
 $platform_email['SMTP_AUTH'] = 0;
diff --git a/src/Chamilo/CoreBundle/Composer/ScriptHandler.php b/src/Chamilo/CoreBundle/Composer/ScriptHandler.php
index dff9e76995..1ab0f3f929 100644
--- a/src/Chamilo/CoreBundle/Composer/ScriptHandler.php
+++ b/src/Chamilo/CoreBundle/Composer/ScriptHandler.php
@@ -83,6 +83,7 @@ class ScriptHandler
             __DIR__.'/../../../../main/inc/lib/javascript/jquery-ui',
             __DIR__.'/../../../../main/inc/lib/fckeditor',
             __DIR__.'/../../../../main/inc/lib/mpdf/',
+            __DIR__.'/../../../../main/inc/lib/phpmailer',
             __DIR__.'/../../../../main/inc/lib/nanogong/',
             __DIR__.'/../../../../main/inc/lib/symfony/',
             __DIR__.'/../../../../main/inc/lib/system/media/renderer',
@@ -159,7 +160,6 @@ class ScriptHandler
             __DIR__.'/../../../../main/inc/autoload.inc.php',
             __DIR__.'/../../../../main/inc/lib/uri.class.php',
             __DIR__.'/../../../../main/inc/lib/db.class.php',
-            __DIR__.'/../../../../main/inc/lib/phpmailer/test/phpmailerTest.php',
             __DIR__.'/../../../../main/inc/lib/xht.lib.php',
             __DIR__.'/../../../../main/inc/lib/xmd.lib.php',
             __DIR__.'/../../../../main/inc/lib/entity.class.php',