Index: branches/5.2.x/core/units/email_events/email_events_event_handler.php
===================================================================
diff -u -N -r14941 -r14968
--- branches/5.2.x/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 14941)
+++ branches/5.2.x/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 14968)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_events_event_handler.php 14941 2011-12-29 12:47:14Z alex $
+* @version	$Id: email_events_event_handler.php 14968 2011-12-30 17:42:27Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -321,7 +321,7 @@
 		 * @param Array $direct_params
 		 * @return Array
 		 */
-		function _processRecipients(&$event, $direct_params = Array ())
+		function _processRecipients(&$event, &$direct_params = Array ())
 		{
 			$this->Application->removeObject('u.email-to');
 
@@ -348,7 +348,9 @@
 			$to_user_id = $event->getEventParam('EmailEventToUserId');
 
 			if ( $to_user_id > 0 ) {
-				$sql = 'SELECT FirstName, LastName, Email
+				$language_field = $event->getEventParam('EmailEventType') == EmailEvent::EVENT_TYPE_FRONTEND ? 'FrontLanguage' : 'AdminLanguage';
+
+				$sql = 'SELECT FirstName, LastName, Email, ' . $language_field . ' AS Language
 						FROM ' . TABLE_PREFIX . 'PortalUser
 						WHERE PortalUserId = ' . $to_user_id;
 				$user_info = $this->Conn->GetRow($sql);
@@ -360,6 +362,10 @@
 						'RecipientName' => trim($user_info['FirstName'] . ' ' . $user_info['LastName']),
 					);
 
+					if ( $user_info['Language'] && !isset($direct_params['language_id']) ) {
+						$direct_params['language_id'] = $user_info['Language'];
+					}
+
 					array_unshift($all_recipients[EmailEvent::RECIPIENT_TYPE_TO], $add_recipient);
 
 					$user =& $this->Application->recallObject('u.email-to', null, Array('skip_autoload' => true));