diff --git a/CHANGELOG b/CHANGELOG
index ab12370f2..ac7385533 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -335,7 +335,17 @@
 - action when clicking on a thumbnail can be set (download or view online)
 - major update of polish translation
 - fix getting access rights in getMandatoryApprovers() and getMandatoryReviewers()
-- better checking for attribute definition when build a search query
+- better checking for attribute definition when building a search query
+- fix list of related documents when hook documentListItem() is implemented
+- move EditAttributes into controller and add various hooks (like EditDocument)
+- move sending notification mail when attributes are changed into
+  Notification Service
+- more documentation on configuring LDAP
+- collect output controller/view hooks with '+' instead of array_merge()
+- add hook 'searchExportOptions'
+- show how many users have to review/approve a document and how many did
+  already (in menu task list and document list)
+- break long original file names on viewDocument page
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.40
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 0b4817da8..a542d4e23 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -3451,6 +3451,8 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 	 * @param object $document
 	 * @param object $previewer
 	 * @param boolean $skipcont set to true if embrasing tr shall be skipped
+	 * In that case call documentListRowStart() before and documentListRowEnd()
+	 * after this method.
 	 */
 	function documentListRow($document, $previewer, $skipcont=false, $version=0, $extracontent=array()) { /* {{{ */
 		$dms = $this->params['dms'];
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 67da7111a..2f708bcb0 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -1940,7 +1940,6 @@ $(document).ready( function() {
 				$responsibleUser = $link->getUser();
 				$targetDoc = $link->getTarget();
 
-				echo $this->documentListRowStart($targetDoc);
 				$targetDoc->verifyLastestContentExpriry();
 				$txt = $this->callHook('documentListItem', $targetDoc, $previewer, false, 'reverselinks');
 				if(is_string($txt))
@@ -1948,6 +1947,7 @@ $(document).ready( function() {
 				else {
 					$extracontent = array();
 					$extracontent['below_title'] = $this->getListRowPath($targetDoc);
+					echo $this->documentListRowStart($targetDoc);
 					echo $this->documentListRow($targetDoc, $previewer, true, 0, $extracontent);
 				}
 				print "<td><span class=\"actions\">";
@@ -2008,7 +2008,6 @@ $(document).ready( function() {
 				$responsibleUser = $link->getUser();
 				$sourceDoc = $link->getDocument();
 
-				echo $this->documentListRowStart($sourceDoc);
 				$sourceDoc->verifyLastestContentExpriry();
 				$txt = $this->callHook('documentListItem', $sourceDoc, $previewer, false, 'reverselinks');
 				if(is_string($txt))
@@ -2016,6 +2015,7 @@ $(document).ready( function() {
 				else {
 					$extracontent = array();
 					$extracontent['below_title'] = $this->getListRowPath($sourceDoc);
+					echo $this->documentListRowStart($sourceDoc);
 					echo $this->documentListRow($sourceDoc, $previewer, true, 0, $extracontent);
 				}
 				print "<td><span class=\"actions\">";
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 43cd35c6b..57aa8a604 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -3423,7 +3423,9 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 	 *
 	 * @param object $document
 	 * @param object $previewer
-	 * @param boolean $skipcont set to true if embrasing tr shall be skipped
+	 * @param boolean $skipcont set to true if embrasing tr shall be skipped.
+	 * In that case call documentListRowStart() before and documentListRowEnd()
+	 * after this method.
 	 */
 	function documentListRow($document, $previewer, $skipcont=false, $version=0, $extracontent=array()) { /* {{{ */
 		$dms = $this->params['dms'];