diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index 11be8f321..ba6ca4306 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -333,7 +333,8 @@ $('body').on('click', '.order-btn', function(ev) {
 			}
 			echo "</table>\n";
 			$infos = ob_get_clean();
-			$this->printAccordion2(getMLText("folder_infos"), $infos);
+			echo $infos;
+//			$this->printAccordion2(getMLText("folder_infos"), $infos);
 			$txt = $this->callHook('postFolderInfos', $folder);
 			if(is_string($txt))
 				echo $txt;
@@ -575,6 +576,7 @@ $('body').on('click', '.order-btn', function(ev) {
 		$previewconverters = $this->params['previewConverters'];
 		$timeout = $this->params['timeout'];
 		$xsendfile = $this->params['xsendfile'];
+		$currenttab = $this->params['currenttab'];
 
 		$folderid = $folder->getId();
 		$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
@@ -634,15 +636,36 @@ $('body').on('click', '.order-btn', function(ev) {
 			$this->rowStart();
 			$this->columnStart(8);
 		}
-
-//		$this->folderInfos();
 ?>
+    <ul class="nav nav-pills" id="folderinfotab" role="tablist">
+			<li class="nav-item <?php if(!$currenttab || $currenttab == 'folderinfo') echo 'active'; ?>"><a class="nav-link <?php if(!$currenttab || $currenttab == 'folderinfo') echo 'active'; ?>" data-target="#folderinfo" data-toggle="tab" role="button"><?php printMLText('folder_infos'); ?></a></li>
+<?php
+			$tabs = $this->callHook('extraTabs', $folder);
+			if($tabs) {
+				foreach($tabs as $tabid=>$tab) {
+					echo '<li class="nav-item '.($currenttab == $tabid ? 'active' : '').'"><a class="nav-link '.($currenttab == $tabid ? 'active' : '').'" data-target="#'.$tabid.'" data-toggle="tab" role="button">'.$tab['title'].'</a></li>';
+				}
+			}
+?>
+		</ul>
+		<div class="tab-content">
+		  <div class="tab-pane <?php if(!$currenttab || $currenttab == 'folderinfo') echo 'active'; ?>" id="folderinfo" role="tabpanel">
 	<div class="ajax" data-view="ViewFolder" data-action="folderInfos" data-no-spinner="true" <?php echo ($folder ? "data-query=\"folderid=".$folder->getID()."\"" : "") ?>></div>
+			</div>
+<?php
+			if($tabs) {
+				foreach($tabs as $tabid=>$tab) {
+					echo '<div class="tab-pane '.($currenttab == $tabid ? 'active' : '').'" id="'.$tabid.'" role="tabpanel">';
+					echo $tab['content'];
+					echo "</div>\n";
+				}
+			}
+?>
+		</div>
 <?php
 		if ($enableDropUpload/* && $folder->getAccessMode($user) >= M_READWRITE*/) {
 			$this->columnEnd();
 			$this->columnStart(4);
-//			$this->dropUpload();
 ?>
 	<div class="ajax" data-view="ViewFolder" data-action="dropUpload" data-no-spinner="true" <?php echo ($folder ? "data-query=\"folderid=".$folder->getID()."\"" : "") ?>></div>
 <?php