diff --git a/out/out.Calendar.php b/out/out.Calendar.php
index ef95b50d8..22a40b405 100644
--- a/out/out.Calendar.php
+++ b/out/out.Calendar.php
@@ -71,6 +71,7 @@ if(isset($_GET['eventtype']) && $_GET['eventtype']) {
 
 if($view) {
 	$view->setParam('accessobject', $accessop);
+	$view->setParam('conversionmgr', $conversionmgr);
 	$view->setParam('onepage', $settings->_onePageMode); // do most navigation by reloading areas of pages with ajax
 	$view->setParam('calendar', $calendar);
 	$view->setParam('start', $start);
@@ -87,6 +88,7 @@ if($view) {
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('previewWidthDetail', $settings->_previewWidthDetail);
+	$view->setParam('previewConverters', isset($settings->_converters['preview']) ? $settings->_converters['preview'] : array());
 	$view->setParam('timeout', $settings->_cmdTimeout);
 	$view->setParam('accessobject', $accessop);
 	$view->setParam('xsendfile', $settings->_enableXsendfile);
diff --git a/views/bootstrap/class.Calendar.php b/views/bootstrap/class.Calendar.php
index 03eeac3d4..a015ec347 100644
--- a/views/bootstrap/class.Calendar.php
+++ b/views/bootstrap/class.Calendar.php
@@ -43,6 +43,8 @@ class SeedDMS_View_Calendar extends SeedDMS_Theme_Style {
 		$event = $this->params['event'];
 		$strictformcheck = $this->params['strictformcheck'];
 		$cachedir = $this->params['cachedir'];
+		$conversionmgr = $this->params['conversionmgr'];
+		$previewconverters = $this->params['previewConverters'];
 		$previewwidthlist = $this->params['previewWidthList'];
 		$previewwidthdetail = $this->params['previewWidthDetail'];
 		$timeout = $this->params['timeout'];
@@ -52,6 +54,10 @@ class SeedDMS_View_Calendar extends SeedDMS_Theme_Style {
 			print $this->folderListHeader();
 			print "<tbody>\n";
 			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout, $xsendfile);
+			if($conversionmgr)
+				$previewer->setConversionMgr($conversionmgr);
+			else
+				$previewer->setConverters($previewconverters);
 			echo $this->documentListRow($document, $previewer);
 			echo "</tbody>\n</table>\n";
 		}
@@ -125,6 +131,8 @@ class SeedDMS_View_Calendar extends SeedDMS_Theme_Style {
 		$dms = $this->params['dms'];
 		$start = explode('-', $this->params['start']);
 		$cachedir = $this->params['cachedir'];
+		$conversionmgr = $this->params['conversionmgr'];
+		$previewconverters = $this->params['previewConverters'];
 		$previewwidthlist = $this->params['previewWidthList'];
 		$previewwidthdetail = $this->params['previewWidthDetail'];
 		$timeout = $this->params['timeout'];
@@ -146,6 +154,10 @@ class SeedDMS_View_Calendar extends SeedDMS_Theme_Style {
 			print "<th>".getMLText("action")."</th>\n";
 			print "</tr>\n</thead>\n<tbody>\n";
 			$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout, $xsendfile);
+			if($conversionmgr)
+				$previewer->setConversionMgr($conversionmgr);
+			else
+				$previewer->setConverters($previewconverters);
 			foreach($data as $i=>$item) {
 				/* Filter out timeline events for the documents not happened on the
 				 * selected day