Index: branches/unlabeled/unlabeled-1.22.2/core/units/email_events/email_events_event_handler.php
===================================================================
diff -u -r5056 -r5240
--- branches/unlabeled/unlabeled-1.22.2/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 5056)
+++ branches/unlabeled/unlabeled-1.22.2/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 5240)
@@ -227,6 +227,7 @@
 			}
 
 			$smtp_object = &$this->Application->recallObject('kSmtpClient');
+			$smtp_object->debug = $this->Application->isDebugMode() && constOn('DBG_SMTP');
 
 			$smtp_server = $this->Application->ConfigValue('Smtp_Server');
 			$smtp_port = $this->Application->ConfigValue('Smtp_Port');
Index: branches/unlabeled/unlabeled-1.42.2/core/kernel/startup.php
===================================================================
diff -u -r4976 -r5240
--- branches/unlabeled/unlabeled-1.42.2/core/kernel/startup.php	(.../startup.php)	(revision 4976)
+++ branches/unlabeled/unlabeled-1.42.2/core/kernel/startup.php	(.../startup.php)	(revision 5240)
@@ -1,5 +1,13 @@
 <?php
 
+	if (!function_exists('getmicrotime')) {
+		function getmicrotime()
+		{
+		    list($usec, $sec) = explode(" ", microtime());
+		    return ((float)$usec + (float)$sec);
+		}
+	}
+
 	define('KERNEL_PATH', FULL_PATH.'/kernel/kernel4');
 	$globals_start = getmicrotime();
 	include_once(KERNEL_PATH.'/globals.php');	// non OOP functions used through kernel, e.g. print_pre
Index: branches/unlabeled/unlabeled-1.12.14/core/kernel/utility/email.php
===================================================================
diff -u -r3788 -r5240
--- branches/unlabeled/unlabeled-1.12.14/core/kernel/utility/email.php	(.../email.php)	(revision 3788)
+++ branches/unlabeled/unlabeled-1.12.14/core/kernel/utility/email.php	(.../email.php)	(revision 5240)
@@ -426,6 +426,11 @@
 
 
 		if($smtp_object->connect($params) && $smtp_object->send($send_params)){
+			if ( $this->Application->isDebugMode() )
+			{
+				$this->Application->Debugger->appendHTML('<pre>'.$smtp_object->debugtext.'</pre>');
+				//define('DBG_REDIRECT', 1);
+			}
 			return true;
 		}
 		else {
Index: branches/unlabeled/unlabeled-1.22.2/kernel/units/email_events/email_events_event_handler.php
===================================================================
diff -u -r5056 -r5240
--- branches/unlabeled/unlabeled-1.22.2/kernel/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 5056)
+++ branches/unlabeled/unlabeled-1.22.2/kernel/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 5240)
@@ -227,6 +227,7 @@
 			}
 
 			$smtp_object = &$this->Application->recallObject('kSmtpClient');
+			$smtp_object->debug = $this->Application->isDebugMode() && constOn('DBG_SMTP');
 
 			$smtp_server = $this->Application->ConfigValue('Smtp_Server');
 			$smtp_port = $this->Application->ConfigValue('Smtp_Port');