diff --git a/api/BusinessLogic/Calendar/CalendarEvent.php b/api/BusinessLogic/Calendar/CalendarEvent.php
index 91a45761..967ae3ea 100644
--- a/api/BusinessLogic/Calendar/CalendarEvent.php
+++ b/api/BusinessLogic/Calendar/CalendarEvent.php
@@ -3,6 +3,8 @@
 namespace BusinessLogic\Calendar;
 
 
+use BusinessLogic\Tickets\AuditTrail;
+
 class CalendarEvent extends AbstractEvent {
     public $type = 'CALENDAR';
 
@@ -18,4 +20,7 @@ class CalendarEvent extends AbstractEvent {
     public $reminderValue;
 
     public $reminderUnits;
+
+    /* @var $auditTrail AuditTrail[] */
+    public $auditTrail = array();
 }
\ No newline at end of file
diff --git a/api/DataAccess/Calendar/CalendarGateway.php b/api/DataAccess/Calendar/CalendarGateway.php
index 705651d0..3561631c 100644
--- a/api/DataAccess/Calendar/CalendarGateway.php
+++ b/api/DataAccess/Calendar/CalendarGateway.php
@@ -76,23 +76,24 @@ class CalendarGateway extends CommonDao {
             $event->reminderUnits = $row['reminder_unit'] === null ? null : ReminderUnit::getByValue($row['reminder_unit']);
 
             $auditTrailSql = "SELECT `at`.`id` AS `id`, `at`.`entity_id`, `at`.`language_key`, `at`.`date`,
-                    `values`.`replacement_index`, `values`.`replacement_values` 
+                    `values`.`replacement_index`, `values`.`replacement_value` 
                 FROM `" . hesk_dbEscape($heskSettings['db_pfix']) . "audit_trail` AS `at`
                 INNER JOIN `" . hesk_dbEscape($heskSettings['db_pfix']) . "audit_trail_to_replacement_values` AS `values`
                     ON `at`.`id` = `values`.`audit_trail_id`
                 WHERE `entity_id` = " . intval($event->id) . "
                     AND `entity_type` = '" . AuditTrailEntityType::CALENDAR_EVENT . "'";
-            $auditTrailRs = hesk_dbFetchAssoc($auditTrailSql);
+            $auditTrailRs = hesk_dbQuery($auditTrailSql);
+            /* @var $auditTrailEntry AuditTrail */
             $auditTrailEntry = null;
-            while ($row = hesk_dbFetchAssoc($rs)) {
-                if ($auditTrailEntry == null || intval($auditTrailEntry['id']) !== intval($row['id'])) {
+            while ($row = hesk_dbFetchAssoc($auditTrailRs)) {
+                if ($auditTrailEntry == null || intval($auditTrailEntry->id) !== intval($row['id'])) {
                     if ($auditTrailEntry !== null) {
-                        //$audit_records[] = $auditTrailEntry;
+                        $event->auditTrail[] = $auditTrailEntry;
                     }
 
                     $auditTrailEntry = new AuditTrail();
-                    $auditTrailEntry->id = $row['id'];
-                    $auditTrailEntry->entityId = $row['entity_id'];
+                    $auditTrailEntry->id = intval($row['id']);
+                    $auditTrailEntry->entityId = intval($row['entity_id']);
                     $auditTrailEntry->entityType = AuditTrailEntityType::CALENDAR_EVENT;
                     $auditTrailEntry->languageKey = $row['language_key'];
                     $auditTrailEntry->date = $row['date'];
@@ -102,7 +103,7 @@ class CalendarGateway extends CommonDao {
             }
 
             if ($auditTrailEntry !== null) {
-                //$event->auditTrail[] = $audiTrailEntry;
+                $event->auditTrail[] = $auditTrailEntry;
             }
 
             $events[] = $event;