Index: branches/unlabeled/unlabeled-1.170.2/core/kernel/application.php
===================================================================
diff -u -r7725 -r7748
--- branches/unlabeled/unlabeled-1.170.2/core/kernel/application.php	(.../application.php)	(revision 7725)
+++ branches/unlabeled/unlabeled-1.170.2/core/kernel/application.php	(.../application.php)	(revision 7748)
@@ -504,8 +504,8 @@
 		$this->registerClass('Template', KERNEL_PATH.'/parser/template.php');
 		$this->registerClass('TemplateParser', KERNEL_PATH.'/parser/template_parser.php',null, 'kDBTagProcessor');
 
-		$this->registerClass('kEmailMessage', KERNEL_PATH.'/utility/email.php');
-		$this->registerClass('kSmtpClient', KERNEL_PATH.'/utility/smtp_client.php');
+		$this->registerClass('kEmailSendingHelper', KERNEL_PATH.'/utility/email_send.php', 'EmailSender', Array('kHelper'));
+		$this->registerClass('kSocket', KERNEL_PATH.'/utility/socket.php', 'Socket');
 
 		if (file_exists(MODULES_PATH.'/in-commerce/units/currencies/currency_rates.php')) {
 			$this->registerClass('kCurrencyRates', MODULES_PATH.'/in-commerce/units/currencies/currency_rates.php');