Index: trunk/core/kernel/utility/email.php
===================================================================
diff -u -N -r2979 -r3216
--- trunk/core/kernel/utility/email.php	(.../email.php)	(revision 2979)
+++ trunk/core/kernel/utility/email.php	(.../email.php)	(revision 3216)
@@ -415,9 +415,9 @@
 			return true;
 		}else {
 
-			if (defined('DEBUG_MODE')){
-				global $debugger;
-				$debugger->appendHTML('<pre>'.$smtp_object->debugtext.'</pre>');
+			if ( $this->Application->isDebugMode() )
+			{
+				$this->Application->Debugger->appendHTML('<pre>'.$smtp_object->debugtext.'</pre>');
 				//define('DBG_REDIRECT', 1);
 			}
 			return false;