Index: trunk/kernel/units/email_events/email_events_event_handler.php
===================================================================
diff -u -N -r1732 -r2070
--- trunk/kernel/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 1732)
+++ trunk/kernel/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 2070)
@@ -103,7 +103,8 @@
 			$message_type 		= $message_object->GetDBField('MessageType');
 			$message_template	= $message_object->GetDBField('Template');
 
-			$email_object 		= &$this->Application->recallObject('kEmailMessage');
+			$email_object = &$this->Application->recallObject('kEmailMessage');
+			$email_object->Compiled = false;
 		
 			$old_autoload = $this->Application->getUnitOption('u', 'AutoLoad');
 			$this->Application->setUnitOption('u', 'AutoLoad', false);
Index: trunk/kernel/units/users/users_event_handler.php
===================================================================
diff -u -N -r2000 -r2070
--- trunk/kernel/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 2000)
+++ trunk/kernel/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 2070)
@@ -291,7 +291,7 @@
 		{
 			$this->Application->setUnitOption($event->Prefix,'AutoLoad',false);
 			$object =& $event->getObject();
-			
+
 			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 			if($items_info)
 			{
@@ -357,6 +357,8 @@
 					$group_info = $this->GetGroupInfo($object->GetID());
 					
 					if ($group_info){
+						if ($event->getEventParam('no_unsubscribe')) return;
+						
 						if ($group_info['PrimaryGroup']){
 							// delete user
 							$object->Delete();
Index: trunk/core/units/email_events/email_events_event_handler.php
===================================================================
diff -u -N -r1732 -r2070
--- trunk/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 1732)
+++ trunk/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 2070)
@@ -103,7 +103,8 @@
 			$message_type 		= $message_object->GetDBField('MessageType');
 			$message_template	= $message_object->GetDBField('Template');
 
-			$email_object 		= &$this->Application->recallObject('kEmailMessage');
+			$email_object = &$this->Application->recallObject('kEmailMessage');
+			$email_object->Compiled = false;
 		
 			$old_autoload = $this->Application->getUnitOption('u', 'AutoLoad');
 			$this->Application->setUnitOption('u', 'AutoLoad', false);
Index: trunk/core/units/users/users_event_handler.php
===================================================================
diff -u -N -r2000 -r2070
--- trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 2000)
+++ trunk/core/units/users/users_event_handler.php	(.../users_event_handler.php)	(revision 2070)
@@ -291,7 +291,7 @@
 		{
 			$this->Application->setUnitOption($event->Prefix,'AutoLoad',false);
 			$object =& $event->getObject();
-			
+
 			$items_info = $this->Application->GetVar( $event->getPrefixSpecial(true) );
 			if($items_info)
 			{
@@ -357,6 +357,8 @@
 					$group_info = $this->GetGroupInfo($object->GetID());
 					
 					if ($group_info){
+						if ($event->getEventParam('no_unsubscribe')) return;
+						
 						if ($group_info['PrimaryGroup']){
 							// delete user
 							$object->Delete();
Index: trunk/core/kernel/utility/email.php
===================================================================
diff -u -N -r1940 -r2070
--- trunk/core/kernel/utility/email.php	(.../email.php)	(revision 1940)
+++ trunk/core/kernel/utility/email.php	(.../email.php)	(revision 2070)
@@ -166,7 +166,7 @@
 			$not_html = wordwrap($not_html, 72);
 			$this->BodyHtml = wordwrap($this->BodyHtml, 72);
 
-
+			$this->Body = '';
 			//$this->Body .= 'Content-Type: multipart/alternative;'.$this->LF()." ".'boundary="----='.$this->TextBoundary.'"'.$this->LF();
 			//$this->Body .= $this->LF();
 			$this->Body .= '------='.$this->EmailBoundary.$this->LF();
@@ -364,8 +364,8 @@
 
 	function send(){
 		
-		//mail($this->HeadersArray['To'], $this->HeadersArray['Subject'], "", $this->getHeaders().$this->LF().$this->LF().$this->getBody());
-		return mail($this->HeadersArray['To'], $this->HeadersArray['Subject'], "", $this->getHeaders().$this->LF().$this->LF().$this->getBody(), '-f'.$this->From);
+		return mail($this->HeadersArray['To'], $this->HeadersArray['Subject'], "", $this->getHeaders().$this->LF().$this->LF().$this->getBody());
+		//return mail($this->HeadersArray['To'], $this->HeadersArray['Subject'], "", $this->getHeaders().$this->LF().$this->LF().$this->getBody(), '-f'.$this->From);
 		
 	}