diff --git a/addressbook/help/EN/addressbook.php b/addressbook/help/EN/addressbook.php
index 68b00878b8..2f6dfd11a9 100755
--- a/addressbook/help/EN/addressbook.php
+++ b/addressbook/help/EN/addressbook.php
@@ -11,9 +11,12 @@
 
 	/* $Id$ */
 
-	$phpgw_flags = Array(
-		'currentapp'	=> 'manual'
+	$phpgw_flags = Array
+	(
+		'headonly'		=> True,
+		'currentapp'	=> 'addressbook'
 	);
+
 	$phpgw_info['flags'] = $phpgw_flags;
 	include('../../../header.inc.php');
 	$font = $phpgw_info['theme']['font'];
diff --git a/addressbook/inc/hook_help.inc.php b/addressbook/inc/hook_help.inc.php
new file mode 100644
index 0000000000..83bdc44b08
--- /dev/null
+++ b/addressbook/inc/hook_help.inc.php
@@ -0,0 +1,27 @@
+<?php
+	/**************************************************************************\
+	* phpGroupWare - Addressbook hook_help                                     *
+	* http://www.phpgroupware.org                                              *
+	* --------------------------------------------                             *
+	*  This program is free software; you can redistribute it and/or modify it *
+	*  under the terms of the GNU General Public License as published by the   *
+	*  Free Software Foundation; either version 2 of the License, or (at your  *
+	*  option) any later version.                                              *
+	\**************************************************************************/
+	/* $Id$ */
+
+	$app_id = $GLOBALS['phpgw']->applications->name2id('addressbook');
+
+	$GLOBALS['phpgw']->help->set_params(array('app_id'	=> $app_id,
+											'app_name'	=> 'addressbook',
+												'title'	=> lang('addressbook')));
+
+	$GLOBALS['phpgw']->help->data[] = array
+	(
+		'text'					=> lang('owerview'),
+		'link'					=> $GLOBALS['phpgw']->help->check_help_file('addressbook.php'),
+		'lang_link_statustext'	=> lang('owerview')
+	);
+
+	$GLOBALS['phpgw']->help->draw();
+?>
diff --git a/addressbook/setup/setup.inc.php b/addressbook/setup/setup.inc.php
index 4740751f94..cafdd5750a 100755
--- a/addressbook/setup/setup.inc.php
+++ b/addressbook/setup/setup.inc.php
@@ -43,18 +43,22 @@
 	$setup_info['addressbook']['tables'][] = 'phpgw_addressbook_servers';
 
 	/* The hooks this app includes, needed for hooks registration */
-	$setup_info['addressbook']['hooks'][] = 'about';
-	$setup_info['addressbook']['hooks'][] = 'admin';
-	$setup_info['addressbook']['hooks'][] = 'add_def_pref';
-	$setup_info['addressbook']['hooks'][] = 'config_validate';
-	$setup_info['addressbook']['hooks'][] = 'home';
-	$setup_info['addressbook']['hooks'][] = 'manual';
-	$setup_info['addressbook']['hooks'][] = 'deleteaccount';
-	$setup_info['addressbook']['hooks'][] = 'notifywindow';
-	$setup_info['addressbook']['hooks'][] = 'preferences';
+	$setup_info['addressbook']['hooks'] = array
+	(
+		'admin',
+		'add_def_pref',
+		'config_validate',
+		'home',
+		'manual',
+		'deleteaccount',
+		'notifywindow',
+		'preferences',
+		'help'
+	);
 
 	/* Dependencies for this app to work */
-	$setup_info['addressbook']['depends'][] = array(
+	$setup_info['addressbook']['depends'][] = array
+	(
 		'appname'  => 'phpgwapi',
 		'versions' => Array('0.9.15', '0.9.16')
 	);
diff --git a/phpgwapi/inc/class.nextmatchs.inc.php b/phpgwapi/inc/class.nextmatchs.inc.php
index 1672a05a1d..5b68659295 100644
--- a/phpgwapi/inc/class.nextmatchs.inc.php
+++ b/phpgwapi/inc/class.nextmatchs.inc.php
@@ -555,16 +555,16 @@
 					if($yours)
 					{
 						$filter_obj = array(
-							array('none',lang('Show all')),
-							array('yours',lang('Only yours')),
-							array('private',lang('private'))
+							array('none',lang('show all')),
+							array('yours',lang('only yours')),
+							array('private',lang('only private'))
 						);
 					}
 					else
 					{
 						$filter_obj = array(
-							array('none',lang('Show all')),
-							array('private',lang('private'))
+							array('none',lang('show all')),
+							array('private',lang('only private'))
 						);
 					}
 					for($index=0; $index<$indexlimit; $index++)
@@ -625,7 +625,7 @@
 				array
 				(
 					'key'	=> 'private',
-					'lang'	=> lang('private')
+					'lang'	=> lang('only private')
 				)
 			);