diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php
index 6363c5f389..af180bd551 100644
--- a/calendar/inc/class.calendar_ui.inc.php
+++ b/calendar/inc/class.calendar_ui.inc.php
@@ -793,6 +793,7 @@ class calendar_ui
 		{
 			$event['category'] = $this->categories->check_list(EGW_ACL_READ, $event['category']);
 		}
+		$event['non_blocking'] = boolval($event['non_blocking']);
 
 		if(!(int)$event['id'] && preg_match('/^([a-z_-]+)([0-9]+)$/i',$event['id'],$matches))
 		{
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index c2d5b15aaf..fdf7b2e2e2 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -330,6 +330,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 	border-width: 1px;
 	border-radius: 6px;
 	border-style: solid;
+	min-height: 1.2em;
+	min-width: 5px;
 	-moz-border-radius: 6px;
 	-webkit-border-radius: 6px;
 	/* It is important there are no CSS transitions, it breaks resize */
@@ -413,6 +415,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 	left: 0px;
 	right: 0px;
 	padding-left: 2px;
+	min-height: 1em;
 /* set via inline style on runtime
  *  background-color: depending on category
  *	color: white || black depending on cat;
@@ -644,6 +647,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 	overflow: hidden;
 	z-index: 20;
 	border: 1px solid black;
+	min-width: 5px;
 /* set via inline style on runtime:
  *  left: depending on startime
  *  width: depending on length
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index b6f1214f10..f5b5c2ca21 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -11,7 +11,7 @@
  * @package calendar
  * @version $Id$
  */
-/* $Id: app.css 53550 2015-09-02 22:40:38Z nathangray $ */
+/* $Id: app.css 53581 2015-09-07 17:13:20Z hnategh $ */
 /*Media print classes*/
 @media print {
   .th td,
@@ -341,6 +341,8 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
   border-width: 1px;
   border-radius: 6px;
   border-style: solid;
+  min-height: 1.2em;
+  min-width: 5px;
   -moz-border-radius: 6px;
   -webkit-border-radius: 6px;
   /* It is important there are no CSS transitions, it breaks resize */
@@ -418,6 +420,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
   left: 0px;
   right: 0px;
   padding-left: 2px;
+  min-height: 1em;
   /* set via inline style on runtime
  *  background-color: depending on category
  *	color: white || black depending on cat;
@@ -646,6 +649,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
   overflow: hidden;
   z-index: 20;
   border: 1px solid black;
+  min-width: 5px;
   /* set via inline style on runtime:
  *  left: depending on startime
  *  width: depending on length