diff --git a/calendar/day.php b/calendar/day.php
index 34b51a3d82..7e189ce877 100644
--- a/calendar/day.php
+++ b/calendar/day.php
@@ -62,7 +62,7 @@
 	}
 
 	$now	= $phpgw->calendar->makegmttime(0, 0, 0, $thismonth, $thisday, $thisyear);
-
+	$now['raw'] += $phpgw->calendar->tz_offset;
 	$m = mktime(0,0,0,$thismonth,1,$thisyear);
 	
 	$var = Array(
diff --git a/calendar/inc/class.calendar.inc.php b/calendar/inc/class.calendar.inc.php
index 0ebfc916bf..7a615d224a 100755
--- a/calendar/inc/class.calendar.inc.php
+++ b/calendar/inc/class.calendar.inc.php
@@ -881,7 +881,7 @@ class calendar extends calendar_
 		$lr_events = CreateObject('calendar.calendar_item');
 
 		$p = CreateObject('phpgwapi.Template',$this->template_dir);
-		$p->set_unknowns('remove');
+		$p->set_unknowns('keep');
 		
 		$templates = Array (
 			'month_header'		=> 'month_header.tpl',
@@ -1078,7 +1078,7 @@ class calendar extends calendar_
 		global $phpgw, $phpgw_info;
 
 		$p = CreateObject('phpgwapi.Template',$this->template_dir);
-		$p->set_unknowns('remove');
+		$p->set_unknowns('keep');
 
 		$templates = Array(
 			'month'			=>	'month.tpl',
@@ -1144,7 +1144,7 @@ class calendar extends calendar_
 		$this->read_repeated_events($owner);
 		
 		$p = CreateObject('phpgwapi.Template',$this->template_dir);
-		$p->set_unknowns('remove');
+		$p->set_unknowns('keep');
 
 		$templates = Array(
 			'month'			=>	'month.tpl',
@@ -1270,7 +1270,7 @@ class calendar extends calendar_
 		$this->read_repeated_events($this->owner);
 
 		$p = CreateObject('phpgwapi.Template',$this->template_dir);
-		$p->set_unknowns('remove');
+		$p->set_unknowns('keep');
 
 		$templates = Array(
 			'day_cal'			=>	'day_cal.tpl',
@@ -1528,6 +1528,7 @@ class calendar extends calendar_
   
 		$p = CreateObject('phpgwapi.Template',$phpgw->calendar->template_dir);
 
+		$p->set_unknowns('keep');
 		$templates = Array(
   			'view_begin'	=> 'view.tpl',
   			'list'			=> 'list.tpl',
diff --git a/calendar/inc/class.calendar_sql.inc.php b/calendar/inc/class.calendar_sql.inc.php
index 218b2ad4c1..6fe67fa663 100755
--- a/calendar/inc/class.calendar_sql.inc.php
+++ b/calendar/inc/class.calendar_sql.inc.php
@@ -874,8 +874,8 @@ class calendar_ extends calendar__
 				. 'cal_priority='.$event->priority.', '
 				. "cal_type='".$type."', "
 				. "cal_access='".$event->access."', "
-				. "cal_name='".$event->name."', "
-				. "cal_description='".$event->description."' "
+				. "cal_name='".addslashes($event->name)."', "
+				. "cal_description='".addslashes($event->description)."' "
 				. 'WHERE cal_id='.$event->id;
 				
 		$this->stream->query($sql,__LINE__,__FILE__);
diff --git a/calendar/templates/default/view.tpl b/calendar/templates/default/view.tpl
index bf95d8863a..561242f8c5 100755
--- a/calendar/templates/default/view.tpl
+++ b/calendar/templates/default/view.tpl
@@ -13,8 +13,6 @@
 
 <!-- BEGIN view_end -->
 </table>
-<p>
-{edit_button}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{delete_button}
 </center>
 <!-- END view_end -->
 
diff --git a/calendar/templates/idsociety/view.tpl b/calendar/templates/idsociety/view.tpl
index bf95d8863a..561242f8c5 100755
--- a/calendar/templates/idsociety/view.tpl
+++ b/calendar/templates/idsociety/view.tpl
@@ -13,8 +13,6 @@
 
 <!-- BEGIN view_end -->
 </table>
-<p>
-{edit_button}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{delete_button}
 </center>
 <!-- END view_end -->