diff --git a/e107_admin/mailout.php b/e107_admin/mailout.php
index 9925917e1..fd88ccfb5 100644
--- a/e107_admin/mailout.php
+++ b/e107_admin/mailout.php
@@ -453,9 +453,14 @@ class mailout_main_ui extends e_admin_ui
'subject' => LAN_MAILOUT_113." ".$add,
'body' => str_replace("[br]", "\n", LAN_MAILOUT_114),
'template' => vartrue($_POST['testtemplate'],null),
- 'shortcodes' => array('USERID'=>555, 'USERNAME'=>'John Smith', 'LOGINNAME'=>'TestName', 'PASSWORD'=>'xxxxxxx', 'ACTIVATION_LINK'=>SITEURL."signup.php#activate")
+ 'shortcodes' => array('USERID'=>555, 'USERNAME'=>'John Smith', 'LOGINNAME'=>'TestName', 'PASSWORD'=>'xxxxxxx', 'ACTIVATION_LINK'=>SITEURL."signup.php#activate"),
);
+ if(E107_DEBUG_LEVEL > 0)
+ {
+ $eml['SMTPDebug'] = true;
+ }
+
if (!e107::getEmail()->sendEmail($sendto, LAN_MAILOUT_189, $eml))
{
$mes->addError(($pref['mailer'] == 'smtp') ? LAN_MAILOUT_67 : LAN_MAILOUT_106);
diff --git a/e107_core/templates/email_template.php b/e107_core/templates/email_template.php
index ab7192b68..abb111abb 100644
--- a/e107_core/templates/email_template.php
+++ b/e107_core/templates/email_template.php
@@ -297,6 +297,11 @@ $EMAIL_TEMPLATE['example']['footer'] = "