Index: branches/5.1.x/core/units/email_events/email_events_event_handler.php
===================================================================
diff -u -N -r13140 -r13151
--- branches/5.1.x/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 13140)
+++ branches/5.1.x/core/units/email_events/email_events_event_handler.php	(.../email_events_event_handler.php)	(revision 13151)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: email_events_event_handler.php 13140 2010-01-26 20:43:58Z alex $
+* @version	$Id: email_events_event_handler.php 13151 2010-01-30 17:40:21Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -648,15 +648,22 @@
 			$fields['Module']['options'] = $options;
 			$this->Application->setUnitOption($event->Prefix, 'Fields', $fields);
 
-			// make grid on "Email Events" tab in "Regional" section show columns of editable language, not admin language
-			$language_id = $this->Application->GetVar('lang_id');
-
-			if ($language_id) {
-				$grids = $this->Application->getUnitOption($event->Prefix, 'Grids');
-				// used by column picker to track column position
-				$grids['Default']['Fields']['Description']['formatter_renamed'] = true;
-				array_rename_key($grids['Default']['Fields'], 'Description', 'l' . $language_id . '_Description');
-				$this->Application->setUnitOption($event->Prefix, 'Grids', $grids);
+			if ($this->Application->GetVar('regional')) {
+				$this->Application->setUnitOption($event->Prefix, 'PopulateMlFields', true);
 			}
 		}
+
+		/**
+		 * Prepare temp tables and populate it
+		 * with items selected in the grid
+		 *
+		 * @param kEvent $event
+		 */
+		function OnEdit(&$event)
+		{
+			parent::OnEdit($event);
+
+			// use language from grid, instead of primary language used by default
+			$event->SetRedirectParam('m_lang', $this->Application->GetVar('m_lang'));
+		}
 	}
\ No newline at end of file