diff --git a/CHANGELOG b/CHANGELOG
index f325dfccc..a749b1907 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+                     Changes in version 5.0.5
+--------------------------------------------------------------------------------
+- merged changes from 4.3.28
+
 --------------------------------------------------------------------------------
                      Changes in version 5.0.4
 --------------------------------------------------------------------------------
@@ -31,6 +36,11 @@
 - add .xml to online file types by default
 - add home folder for users
 
+--------------------------------------------------------------------------------
+                     Changes in version 4.3.28
+--------------------------------------------------------------------------------
+- add expiration in list of documents
+
 --------------------------------------------------------------------------------
                      Changes in version 4.3.27
 --------------------------------------------------------------------------------
diff --git a/SeedDMS_Core/Core/inc.ClassGroup.php b/SeedDMS_Core/Core/inc.ClassGroup.php
index 985db836d..b618e17e9 100644
--- a/SeedDMS_Core/Core/inc.ClassGroup.php
+++ b/SeedDMS_Core/Core/inc.ClassGroup.php
@@ -21,7 +21,7 @@
  * @copyright  Copyright (C) 2002-2005 Markus Westphal, 2006-2008 Malcolm Cowe, 2010 Uwe Steinmann
  * @version    Release: @package_version@
  */
-class SeedDMS_Core_Group {
+class SeedDMS_Core_Group { /* {{{ */
 	/**
 	 * The id of the user group
 	 *
@@ -437,5 +437,5 @@ class SeedDMS_Core_Group {
 		return $notifications;
 	} /* }}} */
 
-}
+} /* }}} */
 ?>
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 267f4b5d9..4f6a5d116 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1818,7 +1818,7 @@ $(document).ready( function() {
 
 			$content .= "<td>";	
 			$content .= "<a draggable=\"false\" href=\"out.ViewDocument.php?documentid=".$docID."&showtree=".$showtree."\">" . htmlspecialchars($document->getName()) . "</a>";
-			$content .= "<br /><span style=\"font-size: 85%; font-style: italic; color: #666; \">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".date('Y-m-d', $document->getDate())."</b>, ".getMLText('version')." <b>".$version."</b> - <b>".date('Y-m-d', $latestContent->getDate())."</b></span>";
+			$content .= "<br /><span style=\"font-size: 85%; font-style: italic; color: #666; \">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".date('Y-m-d', $document->getDate())."</b>, ".getMLText('version')." <b>".$version."</b> - <b>".date('Y-m-d', $latestContent->getDate())."</b>".($document->expires() ? ", ".getMLText('expires').": <b>".getReadableDate($document->getExpires())."</b>" : "")."</span>";
 			if($comment) {
 				$content .= "<br /><span style=\"font-size: 85%;\">".htmlspecialchars($comment)."</span>";
 			}