diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php
index 0c03742007..fb5251c073 100644
--- a/calendar/inc/class.calendar_ui.inc.php
+++ b/calendar/inc/class.calendar_ui.inc.php
@@ -223,6 +223,8 @@ class calendar_ui
 	function do_header()
 	{
 		$GLOBALS['egw_info']['flags']['include_xajax'] = true;
+		// tell egw_framework to include wz_tooltip
+		$GLOBALS['egw_info']['flags']['include_wz_tooltip'] = true;
 		$GLOBALS['egw']->common->egw_header();
 
 		if ($_GET['msg']) echo '<p class="redItalic" align="center">'.html::htmlspecialchars($_GET['msg'])."</p>\n";
diff --git a/home/index.php b/home/index.php
index 3e8eef8ada..b574e4c4e8 100755
--- a/home/index.php
+++ b/home/index.php
@@ -19,21 +19,14 @@
 	*/
 	$GLOBALS['egw_info'] = array(
 		'flags' => array(
-			'noheader'                => False,
-			'nonavbar'                => False,
+			'noheader'                => true,
+			'nonavbar'                => true,
 			'currentapp'              => 'home',
-			'enable_network_class'    => False,
-			'enable_contacts_class'   => False,
-			'enable_nextmatchs_class' => False,
-			'include_xajax'		  => True,
 		)
 	);
 
 	include('../header.inc.php');
 
-	// Display the header which contains all includes etc.
-	common::egw_header();
-
 	/*
 	** Initializing the template
 	*/
@@ -223,4 +216,4 @@
 	}
 	//_debug_array($GLOBALS['egw_info']['user']['preferences']);
 
-	common::egw_footer();
+	$GLOBALS['egw']->framework->render(ob_get_clean());
diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php
index 00dcfad2b1..2b1e8662d5 100644
--- a/phpgwapi/inc/class.egw_framework.inc.php
+++ b/phpgwapi/inc/class.egw_framework.inc.php
@@ -274,8 +274,8 @@ abstract class egw_framework
 			$var['favicon_file'] = common::image('phpgwapi',$GLOBALS['egw_info']['server']['favicon_file']?$GLOBALS['egw_info']['server']['favicon_file']:'favicon.ico');
 		}
 
-		$wz_tooltip = '/phpgwapi/js/wz_tooltip/wz_tooltip.js';
-		if (file_exists(EGW_SERVER_ROOT.$wz_tooltip))
+		if ($GLOBALS['egw_info']['flags']['include_wz_tooltip'] &&
+			file_exists(EGW_SERVER_ROOT.($wz_tooltip = '/phpgwapi/js/wz_tooltip/wz_tooltip.js')))
 		{
 			$include_wz_tooltip = '<script src="'.$GLOBALS['egw_info']['server']['webserver_url'].
 				$wz_tooltip.'?'.filemtime(EGW_SERVER_ROOT.$wz_tooltip).'" type="text/javascript"></script>';
diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php
index 1a5b49ec98..a043684f13 100644
--- a/phpgwapi/inc/class.html.inc.php
+++ b/phpgwapi/inc/class.html.inc.php
@@ -45,11 +45,6 @@ class html
 	 * @var string
 	 */
 	static $api_js_url;
-	/**
-	 * do we need to set the wz_tooltip class, to be included at the end of the page
-	 * @var boolean
-	 */
-	static private $wz_tooltip_included = False;
 
 	/**
 	 * initialise our static vars
@@ -98,8 +93,6 @@ class html
 	/**
 	* Handles tooltips via the wz_tooltip class from Walter Zorn
 	*
-	* Note: The wz_tooltip.js file gets automaticaly loaded at the end of the page
-	*
 	* @param string $text text or html for the tooltip, all chars allowed, they will be quoted approperiate
 	* @param boolean $do_lang (default False) should the text be run though lang()
 	* @param array $options param/value pairs, eg. 'TITLE' => 'I am the title'. Some common parameters:
@@ -109,6 +102,9 @@ class html
 	*/
 	static function tooltip($text,$do_lang=False,$options=False)
 	{
+		// tell egw_framework to include wz_tooltip.js
+		$GLOBALS['egw_info']['flags']['include_wz_tooltip'] = true;
+
 		if ($do_lang) $text = lang($text);
 
 		$ttip = ' onmouseover="Tip(\''.str_replace(array("\n","\r","'",'"'),array('','',"\\'",'&quot;'),$text).'\'';