diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php
index c195efc2d8..a2f4df8b01 100644
--- a/calendar/inc/class.calendar_ui.inc.php
+++ b/calendar/inc/class.calendar_ui.inc.php
@@ -826,7 +826,7 @@ class calendar_ui
 		{
 			$event['app_id'] .= ':'.$event['recur_date'];
 		}
-		$event['parts'] = implode(",\n",$this->bo->participants($event,true));
+		$event['parts'] = implode(",\n",$this->bo->participants($event,false));
 		$event['date'] = $this->bo->date2string($event['start']);
 
 		// Change dates
diff --git a/calendar/inc/class.calendar_uilist.inc.php b/calendar/inc/class.calendar_uilist.inc.php
index 735eac0fd5..2e55680df6 100644
--- a/calendar/inc/class.calendar_uilist.inc.php
+++ b/calendar/inc/class.calendar_uilist.inc.php
@@ -397,7 +397,6 @@ class calendar_uilist extends calendar_ui
 		}
 		foreach((array) $this->bo->search($search_params, !empty($col_filter) ? $col_filter : null) as $event)
 		{
-			$this->to_client($event);
 
 			if ($params['csv_export'])
 			{
@@ -405,8 +404,7 @@ class calendar_uilist extends calendar_ui
 			}
 			else
 			{
-				$event['parts'] = implode(",\n",$this->bo->participants($event,true));
-				$event['date'] = $this->bo->date2string($event['start']);
+				$this->to_client($event);
 			}
 
 
diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php
index c8ba911fb2..a743044918 100644
--- a/calendar/inc/class.calendar_uiviews.inc.php
+++ b/calendar/inc/class.calendar_uiviews.inc.php
@@ -2978,6 +2978,7 @@ class calendar_uiviews extends calendar_ui
 							$dayEvents[$day][$num]['whole_day']=true;
 						}
 					}
+					$this->to_client($dayEvents[$day][$num]);
 				}
 				// check after every day if we have to increase $this->extraRows
 				if(($this->extraRowsOriginal+$extraRowsToAdd) > $this->extraRows)