diff --git a/calendar/day.php b/calendar/day.php
index fbb5080aef..34b51a3d82 100644
--- a/calendar/day.php
+++ b/calendar/day.php
@@ -78,5 +78,12 @@
 	$p->set_var($var);
 
 	$p->pparse('out','day_t');
-	$phpgw->common->phpgw_footer();
+	if(!isset($friendly) || $friendly == False)
+	{
+		$phpgw->common->phpgw_footer();
+	}
+	else
+	{
+		$phpgw->common->phpgw_exit();
+	}
 ?>
diff --git a/calendar/month.php b/calendar/month.php
index 5cac2574cd..9cebf020bf 100755
--- a/calendar/month.php
+++ b/calendar/month.php
@@ -76,5 +76,12 @@
 
 	$p->set_var($var);
 	$p->pparse('out','index_t');
-	$phpgw->common->phpgw_footer();
+	if(!isset($friendly) || $friendly == False)
+	{
+		$phpgw->common->phpgw_footer();
+	}
+	else
+	{
+		$phpgw->common->phpgw_exit();
+	}
 ?>
diff --git a/calendar/week.php b/calendar/week.php
index d6f61f308d..9d107d103e 100755
--- a/calendar/week.php
+++ b/calendar/week.php
@@ -14,7 +14,7 @@
 
 	/* $Id$ */
 	
-	if (isset($friendly) && $friendly)
+	if (isset($friendly) && $friendly == True)
 	{
 		$phpgw_flags = Array(
 			'currentapp'					=>	'calendar',
@@ -100,5 +100,12 @@
 
 	$p->set_var($var);
 	$p->pparse('out','week_t');
-	$phpgw->common->phpgw_footer();
+	if(!isset($friendly) || $friendly == False)
+	{
+		$phpgw->common->phpgw_footer();
+	}
+	else
+	{
+		$phpgw->common->phpgw_exit();
+	}
 ?>
diff --git a/calendar/year.php b/calendar/year.php
index 1e15331fda..ffcb2d41d7 100755
--- a/calendar/year.php
+++ b/calendar/year.php
@@ -74,5 +74,12 @@
 	. "status = '" . lang("Generate printer-friendly version") . "'\">["
 	. lang("Printer Friendly") . "]</A>";
   }
-  $phpgw->common->phpgw_footer();
+	if(!isset($friendly) || $friendly == False)
+	{
+		$phpgw->common->phpgw_footer();
+	}
+	else
+	{
+		$phpgw->common->phpgw_exit();
+	}
 ?>