diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php
index a8483f3810..d79603261e 100644
--- a/calendar/inc/class.calendar_ical.inc.php
+++ b/calendar/inc/class.calendar_ical.inc.php
@@ -1943,6 +1943,7 @@ class calendar_ical extends calendar_boupdate
 			'recur_exception'	=> 'recur_exception',
 			'title'				=> 'title',
 			'alarm'				=> 'alarm',
+			'whole_day'			=> 'whole_day',
 		);
 
 		$defaultFields['basic'] = $defaultFields['minimal'] + array(
@@ -2126,6 +2127,7 @@ class calendar_ical extends calendar_boupdate
 				{
 					default:
 						$this->supportedFields = $defaultFields['full'];
+						unset($this->supportedFields['whole_day']);
 				}
 				break;
 
@@ -2412,7 +2414,10 @@ class calendar_ical extends calendar_boupdate
 			switch ($attributes['name'])
 			{
 				case 'X-MICROSOFT-CDO-ALLDAYEVENT':
-					$event['whole_day'] = (isset($attributes['value'])?strtoupper($attributes['value'])=='TRUE':true);
+					if (isset($supportedFields['whole_day']))
+					{
+						$event['whole_day'] = (isset($attributes['value'])?strtoupper($attributes['value'])=='TRUE':true);
+					}
 					break;
 				case 'AALARM':
 				case 'DALARM':
@@ -2929,6 +2934,7 @@ class calendar_ical extends calendar_boupdate
 				case 'recur_data':
 				case 'recur_exception':
 				case 'recur_count':
+				case 'whole_day':
 					// not handled here
 					break;