diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index aa54a9a840..fdf48d9135 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -1652,9 +1652,9 @@ class calendar_uiforms extends calendar_ui
 			}
 			else
 			{
-				html::content_header('event.ics','text/calendar',bytes($ical));
+				$GLOBALS['egw']->browser->content_header('event.ics','text/calendar',bytes($ical));
 				echo $ical;
-				common::egw_exit();
+				$GLOBALS['egw']->common->egw_exit();
 			}
 		}
 		if (is_array($content))
diff --git a/calendar/inc/class.uiholiday.inc.php b/calendar/inc/class.uiholiday.inc.php
index e2df96b837..36454e446e 100755
--- a/calendar/inc/class.uiholiday.inc.php
+++ b/calendar/inc/class.uiholiday.inc.php
@@ -479,7 +479,9 @@
 			if (isset($_GET['download']))
 			{
 				$locale = $this->bo->locales[0];
-				html::content_header("holidays.$locale.csv",'text/text');
+				$browser =& CreateObject('phpgwapi.browser');
+				$browser->content_header("holidays.$locale.csv",'text/text'); 	 
+				unset($browser);
 
 				echo "charset\t".translation::charset()."\n";
 				$last_year = -1;