diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index ea2f0825c..d6b3f2e50 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -212,7 +212,6 @@ class e107
 		'userlogin'					 	 => '{e_HANDLER}login.php',
 		'validatorClass'				 => '{e_HANDLER}validator_class.php',
 		'xmlClass'						 => '{e_HANDLER}xml_class.php',
-		'e107MailManager'                => '{e_HANDLER}mail_manager_class.php'
 	);
 
 	/**
@@ -3579,7 +3578,7 @@ class e107
 		}
 		else
 		{
-			define('e_QUERY', '');
+		//	 define('e_QUERY', ''); // breaks news sef-urls and possibly others. Moved to index.php.
 		}
 		
 
diff --git a/index.php b/index.php
index f9220f72c..103df8a35 100644
--- a/index.php
+++ b/index.php
@@ -125,6 +125,7 @@
 					if(file_exists($file))
 					{
 						define('e_CURRENT_PLUGIN', $plug);
+						define('e_QUERY', $query); // do not add to e107_class.php
 						include_once($file);
 						exit;
 					}