diff --git a/e107_admin/db.php b/e107_admin/db.php
index d71c840f2..3a9c995c7 100644
--- a/e107_admin/db.php
+++ b/e107_admin/db.php
@@ -1311,17 +1311,18 @@ class system_tools
 	 * Optimize SQL
 	 * @return none
 	 */
-	private function optimizesql($mySQLdefaultdb) //FIXME Use mysql class. 
+	private function optimizesql($mySQLdefaultdb) 
 	{
-	//	global $mes;
-		$result = mysql_list_tables($mySQLdefaultdb);
-		while($row = mysql_fetch_row($result))
+		$mes = e107::getMessage();
+		$tables = e107::getDb()->tables();
+		
+		foreach($tables as $table)
 		{
-			mysql_query("OPTIMIZE TABLE ".$row[0]);
+			e107::getDb()->gen("OPTIMIZE TABLE ".$table);
 		}
 
-	//	$mes->add(DBLAN_11." $mySQLdefaultdb ".DBLAN_12, E_MESSAGE_SUCCESS);
-		e107::getRender()->tablerender(DBLAN_10.SEP.DBLAN_7, DBLAN_11." $mySQLdefaultdb ".DBLAN_12);
+		$mes->addSuccess(e107::getParser()->lanVars(DBLAN_11, $mySQLdefaultdb));
+		e107::getRender()->tablerender(DBLAN_10.SEP.DBLAN_7, $mes->render());
 	}
 
 	/**
diff --git a/e107_languages/English/admin/lan_db.php b/e107_languages/English/admin/lan_db.php
index a959eaad3..ed123acdd 100644
--- a/e107_languages/English/admin/lan_db.php
+++ b/e107_languages/English/admin/lan_db.php
@@ -17,8 +17,8 @@ define("DBLAN_7", "Optimize SQL database");
 define("DBLAN_8", "Select to backup your core settings");
 define("DBLAN_9", "Backup core");
 define("DBLAN_10", "Database Utilities");
-define("DBLAN_11", "MySQL database");
-define("DBLAN_12", "optimized");
+define("DBLAN_11", "MySQL database [x] optimized");
+//define("DBLAN_12", "optimized");
 // define("DBLAN_13", "Back");
 // define("DBLAN_14", "Done");
 define("DBLAN_15", "Select to check for any available db updates");