diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index a18c3de2d..149194b61 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -94,6 +94,30 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 	} /* }}} */
 
 	protected function printVersionAttributes($folder, $version) { /* {{{ */
+		$f = null;
+		$attrdefgrps = $folder->getAttributeDefintionGroupList(true, $f);
+		if($attrdefgrps) {
+			foreach($attrdefgrps as $attrdefgrp) {
+				$attrdefs = $attrdefgrp['group']->getAttributeDefinitions(array(SeedDMS_Core_AttributeDefinition::objtype_all, SeedDMS_Core_AttributeDefinition::objtype_documentcontent), SeedDMS_Core_AttributeDefinitionGroup::show_details);
+				if($attrdefs) {
+					echo "<b>".htmlspecialchars($attrdefgrp['group']->getName())."</b><br />";
+					foreach($attrdefs as $attrdefarr) {
+						$attrdef = $attrdefarr['attrdef'];
+						$attribute = $latestContent->getAttribute($attrdef);
+						if($attribute) {
+							$arr = $this->callHook('showDocumentContentAttribute', $latestContent, $attribute);
+							if(is_array($arr)) {
+								echo "<li>".$arr[0].": ".$arr[1]."</li>\n";
+							} else {
+								print "<li>".htmlspecialchars($attrdef->getName()).": ";
+								$this->printAttributeValue($attribute);
+								echo "</li>\n";
+							}
+						}
+					}
+				}
+			}
+		} else {
 			$attributes = $version->getAttributes();
 			if($attributes) {
 				foreach($attributes as $attribute) {
@@ -108,6 +132,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
 					}
 				}
 			}
+		}
 			$arrarr = $this->callHook('additionalDocumentContentInfo', $version);
 			if(is_array($arrarr)) {
 				foreach($arrarr as $arr) {