diff --git a/api/src/Storage/History.php b/api/src/Storage/History.php
index 4a9f8ff45d..fd8de9e62f 100644
--- a/api/src/Storage/History.php
+++ b/api/src/Storage/History.php
@@ -322,7 +322,7 @@ class History
 			$query['num_rows']
 		) as $row)
 		{
-			$row['user_ts'] = $GLOBALS['egw']->db->from_timestamp($row['history_timestamp']) + 3600 * $GLOBALS['egw_info']['user']['preferences']['common']['tz_offset'];
+			$row['user_ts'] = Api\DateTime::server2user($GLOBALS['egw']->db->from_timestamp($row['history_timestamp']), Api\DateTime::ET2);
 
 			// Explode multi-part values
 			foreach(array('history_new_value', 'history_old_value') as $field)
@@ -413,4 +413,4 @@ class History
 			$name == 'De' ||    // Tracker, InfoLog
 			($value && (strlen($value) > 200 || strstr($value, "\n") !== FALSE));
 	}
-}
+}
\ No newline at end of file