diff --git a/admin/applications.php b/admin/applications.php
index 776fd2b20f..4efadbfd48 100644
--- a/admin/applications.php
+++ b/admin/applications.php
@@ -23,61 +23,135 @@
 	$p->set_block('applications','list','list');
 	$p->set_block('applications','row','row');
 
-	if ($order)
+	$applications = array();
+
+	$offset = $phpgw_info['user']['preferences']['common']['maxmatchs'];
+
+	$apps = $phpgw_info['apps'];
+	$total = count($apps);
+
+	if(!$sort)
 	{
-		$ordermethod = "ORDER BY $order $sort";
+		$sort = 'ASC';
+	}
+
+	if($sort == 'ASC')
+	{
+		ksort($apps);
 	}
 	else
 	{
-		$ordermethod = "ORDER BY app_title ASC";
+		krsort($apps);
 	}
 
-	if (!$sort)
+	if ($start && $offset)
 	{
-		$sort = "DESC";
+		$limit = $start + $offset;
+	}
+	elseif ($start && !$offset)
+	{
+		$limit = $start;
+	}
+	elseif(!$start && !$offset)
+	{
+		$limit = $total;
+	}
+	else
+	{
+		$start = 0;
+		$limit = $offset;
+	}
+/*
+	echo 'START: ' . $start;
+	echo 'LIMIT: ' . $limit;
+	echo 'TOTAL: ' . $total;
+*/
+	$i = 0;
+	while(list($app,$data) = @each($apps))
+	{
+		if($i >= $start && $i<= $limit)
+		{
+			if ($data['status'] < 3)
+			{
+				$applications[$app] = $data;
+			}
+		}
+		$i++;
 	}
 
 	$p->set_var('lang_installed',lang('Installed applications'));
 	$p->set_var('bg_color',$phpgw_info['theme']['bg_color']);
 	$p->set_var('th_bg',$phpgw_info['theme']['th_bg']);
 
-	$p->set_var('sort_title',$phpgw->nextmatchs->show_sort_order($sort,"app_title",$order,"/admin/applications.php",lang('title')));
+	$p->set_var('sort_title',$phpgw->nextmatchs->show_sort_order($sort,'app_title','app_title','/admin/applications.php',lang('Title')));
 	$p->set_var('lang_edit',lang('Edit'));
 	$p->set_var('lang_delete',lang('Delete'));
 	$p->set_var('lang_enabled',lang('Enabled'));
 
-	$phpgw->db->query("SELECT * FROM phpgw_applications WHERE app_enabled!='3' $ordermethod",__LINE__,__FILE__);
-	while ($phpgw->db->next_record())
+	@reset($applications);
+	while (list($key,$app) = @each($applications))
 	{
 		$tr_color = $phpgw->nextmatchs->alternate_row_color($tr_color);
-		$name = $phpgw->db->f("app_title");
- 
-		if (! $phpgw->db->f('app_title')) $name = $phpgw->db->f('app_name');
-		if (! $name)                      $name = "&nbsp;";
+
+		if($app['title'])
+		{
+			$name = $app['title'];
+		}
+		elseif($app['name'])
+		{
+			$name = $app['name'];
+		}
+		else
+		{
+			$name = '&nbsp;';
+		}
 
 		$p->set_var('tr_color',$tr_color);
 		$p->set_var('name',$name);
 
-		$p->set_var('edit','<a href="' . $phpgw->link('/admin/editapplication.php','app_name=' . urlencode($phpgw->db->f('app_name'))) . '"> ' . lang('Edit') . ' </a>');
-		$p->set_var('delete','<a href="' . $phpgw->link('/admin/deleteapplication.php','app_name=' . urlencode($phpgw->db->f('app_name'))) . '"> ' . lang('Delete') . ' </a>');
+		$p->set_var('edit','<a href="' . $phpgw->link('/admin/editapplication.php','app_name=' . urlencode($app['name'])) . '"> ' . lang('Edit') . ' </a>');
+		$p->set_var('delete','<a href="' . $phpgw->link('/admin/deleteapplication.php','app_name=' . urlencode($app['name'])) . '"> ' . lang('Delete') . ' </a>');
 
-		if ($phpgw->db->f('app_enabled') != 0)
+		if ($app['status'])
 		{
 			$status = lang('Yes');
 		}
 		else
 		{
-			$status = "<b>" . lang('No') . "</b>";
+			$status = '<b>' . lang('No') . '</b>';
 		}
 		$p->set_var('status',$status);
 
 		$p->parse('rows','row',True);
 	}
 
+	if (($start + $limit) > $total)
+	{
+		$lang_showing = lang('showing x - x of x',($start + 1),$total,$total);
+	}
+	elseif ($total > $limit)
+	{
+		$lang_showing=lang('showing x - x of x',($start + 1),($start + $limit),$total);
+	}
+	else
+	{
+		$lang_showing=lang('showing x',$c->total_records);
+	}
+	$p->set_var('lang_showing',$lang_showing);
+
+	$left = $phpgw->nextmatchs->left('/admin/applications.php',$start,$total);
+	$right = $phpgw->nextmatchs->right('/admin/applications.php',$start,$total);
+	$p->set_var('left',$left);
+	$p->set_var('right',$right);
+
 	$p->set_var('new_action',$phpgw->link('/admin/newapplication.php'));
 	$p->set_var('lang_add',lang('add'));
 
 	$p->pparse('out','list');
-
+/*
+	echo '<pre>';
+	print_r($applications);
+	echo '</pre>';
+*/
 	$phpgw->common->phpgw_footer();
 ?>