diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php
index 1935eac3ed..21c69e014e 100644
--- a/phpgwapi/inc/class.html.inc.php
+++ b/phpgwapi/inc/class.html.inc.php
@@ -1333,7 +1333,8 @@ class html
 		}
 		if($fn)
 		{
-			if(self::$user_agent == 'msie') // && self::$ua_version == '5.5')
+			// limit IE hack (no attachment in Content-disposition header) to IE < 9
+			if(self::$user_agent == 'msie' && self::$ua_version < 9)
 			{
 				$attachment = '';
 			}