diff --git a/class2.php b/class2.php
index 1cb8cd903..e6966afff 100644
--- a/class2.php
+++ b/class2.php
@@ -9,8 +9,8 @@
 * General purpose file
 *
 * $Source: /cvs_backup/e107_0.8/class2.php,v $
-* $Revision: 1.144 $
-* $Date: 2009-09-15 13:34:09 $
+* $Revision: 1.145 $
+* $Date: 2009-09-19 15:27:26 $
 * $Author: secretr $
 *
 */
@@ -1876,10 +1876,10 @@ function class_list($uid = '')
 // ---------------------------------------------------------------------------
 
 
-//DEPRECATED - use e107::getLan();
+//DEPRECATED - use e107::includeLan();
 function include_lan($path, $force = false)
 {
-	return e107::getLan($path, $force);
+	return e107::includeLan($path, $force);
 }
 
 /*
diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php
index f2080774c..bf409aab1 100644
--- a/e107_admin/newspost.php
+++ b/e107_admin/newspost.php
@@ -9,8 +9,8 @@
  * News Administration
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/newspost.php,v $
- * $Revision: 1.53 $
- * $Date: 2009-09-14 18:22:15 $
+ * $Revision: 1.54 $
+ * $Date: 2009-09-19 15:27:25 $
  * $Author: secretr $
 */
 require_once("../class2.php");
@@ -2375,7 +2375,7 @@ class admin_newspost
 
 	function show_options()
 	{
-		$e107 = &e107::getInstance();
+		$e107 = e107::getInstance();
 
 		$var['main']['text'] = NWSLAN_44;
 		$var['main']['link'] = e_SELF;
diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index aa9a1caa4..26f726ea7 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -9,8 +9,8 @@
  * e107 Main
  *
  * $Source: /cvs_backup/e107_0.8/e107_handlers/e107_class.php,v $
- * $Revision: 1.50 $
- * $Date: 2009-09-14 18:22:15 $
+ * $Revision: 1.51 $
+ * $Date: 2009-09-19 15:27:26 $
  * $Author: secretr $
 */
 
@@ -58,6 +58,12 @@ class e107
 	 */
 	protected static $_sc_core_loaded = false;
 	
+	/**
+	 * message handler included check
+	 * @var boolean
+	 */
+	protected static $_message_included = false;
+	
 	/**
 	 * Singleton instance
 	 * Allow class extends - override {@link getInstance()}
@@ -428,7 +434,6 @@ class e107
 			e107::setRegistry($id, new $class_name());
 		}
 
-
 		return self::getRegistry($id);
 	}
 	
@@ -785,6 +790,21 @@ class e107
 		return self::getSingleton('e_online', true);
 	}
 	
+	/**
+	 * Retrieve message handler singleton
+	 *
+	 * @return eMessage
+	 */
+	public static function getMessageHandler()
+	{
+		if(!self::$_message_included)
+		{
+			e107_require_once(e_HANDLER.'message_handler.php');
+			self::$_message_included = true;
+		}
+		return eMessage::getInstance();
+	}
+	
 	/**
 	 * Get core template. Use this method for templates, which are following the 
 	 * new template standards:
@@ -911,7 +931,7 @@ class e107
 	 * @param boolean $force
 	 * @return string
 	 */
-	public static function getLan($path, $force = false)
+	public static function includeLan($path, $force = false)
 	{
 		global $pref;
 		if (!is_readable($path))
diff --git a/install_.php b/install_.php
index 5589f6d75..b45427dbe 100644
--- a/install_.php
+++ b/install_.php
@@ -9,9 +9,9 @@
 * Installation file
 *
 * $Source: /cvs_backup/e107_0.8/install_.php,v $
-* $Revision: 1.41 $
-* $Date: 2009-09-17 13:52:33 $
-* $Author: e107coders $
+* $Revision: 1.42 $
+* $Date: 2009-09-19 15:27:26 $
+* $Author: secretr $
 *
 */
 
@@ -148,7 +148,7 @@ unset($e107_paths);
 
 function include_lan($path, $force = false)
 {
-	return e107::getLan($path, $force);
+	return e107::includeLan($path, $force);
 }
 //obsolete $e107->e107_dirs['INSTALLER'] = "{$installer_folder_name}/";