diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php
index 3e4255c6f2..7fdd73aa0c 100644
--- a/phpgwapi/inc/class.html.inc.php
+++ b/phpgwapi/inc/class.html.inc.php
@@ -113,15 +113,30 @@ class html
 
 		$ttip = ' onmouseover="Tip(\''.str_replace(array("\n","\r","'",'"'),array('','',"\\'",'"'),$text).'\'';
 		
+		$sticky = false;
 		if (is_array($options))
 		{
 			foreach($options as $option => $value)
 			{
-				$ttip .= ','.strtoupper($option).','.$value;
+				$option = strtoupper($option);
+				if ($option == 'STICKY') $sticky = (bool)$value;
+
+				switch(gettype($value))
+				{
+					case 'boolean':
+						$value = $value ? 'true' : 'false';
+						break;
+					case 'string':
+						$value = "'$value'";
+						break;
+				}
+				$ttip .= ','.$option.','.$value;
 			}
 		}
-		$ttip .= ')" onmouseout="UnTip()"';
-		
+		$ttip .= ')"';
+
+		if (!$sticky) $ttip .= ' onmouseout="UnTip()"';
+
 		return $ttip;
 	}