diff --git a/preferences/categories.php b/preferences/categories.php
index a95765a61a..e2837b1467 100644
--- a/preferences/categories.php
+++ b/preferences/categories.php
@@ -9,14 +9,24 @@
 	* Free Software Foundation; either version 2 of the License, or (at your	*
 	* option) any later version.												*
 	\***************************************************************************/
+
 	/* $Id$ */
 
-	$phpgw_flags = array('currentapp' => $cats_app,
-			'enable_nextmatchs_class' => True,
-			'noappheader' => True,
-			'noappfooter' => True);
+	$phpgw_info['flags'] = array(
+		'currentapp'              => $cats_app,
+		'enable_nextmatchs_class' => True
+	);
+
+	if (! $appheader)
+	{
+		$phpgw_info['flags']['noappheader'] = True;
+	}
+
+	if (! $appfooter)
+	{
+		$phpgw_info['flags']['noappfooter'] = True;
+	}
 
-	$phpgw_info['flags'] = $phpgw_flags;
 	include('../header.inc.php');
 
 	$t = CreateObject('phpgwapi.Template',$phpgw->common->get_tpl_dir('preferences'));