diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index f97d1c1bb..1a9725b47 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -186,6 +186,10 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$document = $this->params['document'];
 		$checkoutdir = $this->params['checkOutDir'];
 
+		$txt = $this->callHook('documentInfos', $document);
+		if(is_string($txt))
+			echo $txt;
+		else {
 		$this->contentHeading(getMLText("document_infos"));
 		$txt = $this->callHook('checkOutInfo', $document);
 		if(is_string($txt)) {
@@ -206,10 +210,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		$txt = $this->callHook('preDocumentInfos', $document);
 		if(is_string($txt))
 			echo $txt;
-		$txt = $this->callHook('documentInfos', $document);
-		if(is_string($txt))
-			echo $txt;
-		else {
 ?>
 		<table class="table-condensed">
 <?php
@@ -324,8 +324,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 <?php
 			}
 		}
-?>
-		<?php
 		$attributes = $document->getAttributes();
 		if($attributes) {
 			foreach($attributes as $attribute) {
@@ -348,14 +346,25 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				}
 			}
 		}
+		$arrarr = $this->callHook('additionalDocumentInfos', $document);
+		if(is_array($arrarr)) {
+			foreach($arrarr as $arr) {
+				echo "<tr>";
+				echo "<td>".$arr[0].":</td>";
+				echo "<td>".$arr[1]."</td>";
+				echo "</tr>";
+			}
+		} elseif(is_string($arrarr)) {
+			echo $arrarr;
+		}
 ?>
 		</table>
 <?php
-		}
 		$txt = $this->callHook('postDocumentInfos', $document);
 		if(is_string($txt))
 			echo $txt;
 		$this->contentContainerEnd();
+		}
 	} /* }}} */
 
 	function preview() { /* {{{ */
diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index b3dd1628e..7d7a31f2f 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -232,7 +232,7 @@ $('body').on('click', '.order-btn', function(ev) {
 		$user = $this->params['user'];
 		$folder = $this->params['folder'];
 
-		$txt = $this->callHook('folderInfo', $folder);
+		$txt = $this->callHook('folderInfos', $folder);
 		if(is_string($txt))
 			echo $txt;
 		else {
@@ -240,6 +240,9 @@ $('body').on('click', '.order-btn', function(ev) {
 			$owner = $folder->getOwner();
 			$this->contentHeading(getMLText("folder_infos"));
 			$this->contentContainerStart();
+			$txt = $this->callHook('preFolderInfos', $folder);
+			if(is_string($txt))
+				echo $txt;
 			echo "<table class=\"table-condensed\">\n";
 			if($user->isAdmin()) {
 				echo "<tr>";
@@ -305,7 +308,21 @@ $('body').on('click', '.order-btn', function(ev) {
 					}
 				}
 			}
+			$arrarr = $this->callHook('additionalFolderInfos', $folder);
+			if(is_array($arrarr)) {
+				foreach($arrarr as $arr) {
+					echo "<tr>";
+					echo "<td>".$arr[0].":</td>";
+					echo "<td>".$arr[1]."</td>";
+					echo "</tr>";
+				}
+			} elseif(is_string($arrarr)) {
+				echo $arrarr;
+			}
 			echo "</table>\n";
+			$txt = $this->callHook('postFolderInfos', $folder);
+			if(is_string($txt))
+				echo $txt;
 			$this->contentContainerEnd();
 		}
 	} /* }}} */