Index: branches/5.1.x/core/units/helpers/language_import_helper.php
===================================================================
diff -u -N -r13877 -r13901
--- branches/5.1.x/core/units/helpers/language_import_helper.php	(.../language_import_helper.php)	(revision 13877)
+++ branches/5.1.x/core/units/helpers/language_import_helper.php	(.../language_import_helper.php)	(revision 13901)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: language_import_helper.php 13877 2010-08-28 20:52:35Z alex $
+* @version	$Id: language_import_helper.php 13901 2010-08-29 10:25:24Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -263,7 +263,7 @@
 
 			$sql = 'SELECT *
 					FROM ' . $this->Application->getUnitOption('emailevents', 'TableName') . '
-					WHERE `Type` IN (' . implode(',', $phrase_types) . ') AND ' . substr($module_sql, 0, -4) . ' AND ' . $limit_where . '
+					WHERE `Type` IN (' . implode(',', $phrase_types) . ') AND (' . substr($module_sql, 0, -4) . ') AND ' . $limit_where . '
 					ORDER BY `Event`, `Type`';
 			$events = $this->Conn->Query($sql, 'EventId');
 
Index: branches/5.1.x/core/units/phrases/phrases_event_handler.php
===================================================================
diff -u -N -r13453 -r13901
--- branches/5.1.x/core/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 13453)
+++ branches/5.1.x/core/units/phrases/phrases_event_handler.php	(.../phrases_event_handler.php)	(revision 13901)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: phrases_event_handler.php 13453 2010-04-28 11:22:05Z alex $
+* @version	$Id: phrases_event_handler.php 13901 2010-08-29 10:25:24Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -29,9 +29,10 @@
 		{
 			// don't call parent
 			if ($event->Special == 'import' || $event->Special == 'export') {
-				$object->setRequired('LangFile', true);
-				$object->setRequired('Phrase', false);
-				$object->setRequired('l' . $this->Application->GetVar('m_lang') . '_Translation', false);
+				$this->RemoveRequiredFields($object);
+				$object->setRequired('LangFile');
+				$object->setRequired('PhraseType');
+				$object->setRequired('Module');
 
 				// allow multiple phrase types to be selected during import/export
 				$field_options = $object->GetFieldOptions('PhraseType');