diff --git a/op/op.AddSubFolder.php b/op/op.AddSubFolder.php
index f6bf6ba9d..eafbecb4a 100644
--- a/op/op.AddSubFolder.php
+++ b/op/op.AddSubFolder.php
@@ -56,7 +56,8 @@ if (!is_numeric($sequence)) {
 
 $name = $_POST["name"];
 $comment = $_POST["comment"];
-$subFolder = $folder->addSubFolder($name, $comment, $user, $sequence);
+$attributes = $_POST["attributes"];
+$subFolder = $folder->addSubFolder($name, $comment, $user, $sequence, $attributes);
 
 if (is_object($subFolder)) {
 	// Send notification to subscribers.
diff --git a/out/out.AddSubFolder.php b/out/out.AddSubFolder.php
index 01cfc028b..395be5847 100644
--- a/out/out.AddSubFolder.php
+++ b/out/out.AddSubFolder.php
@@ -87,6 +87,19 @@ function checkForm()
 			<td class="inputDescription"><?php printMLText("sequence");?>:</td>
 			<td><?php UI::printSequenceChooser($folder->getSubFolders());?></td>
 		</tr>
+<?php
+	$attrdefs = $dms->getAllAttributeDefinitions(array(LetoDMS_Core_AttributeDefinition::objtype_folder, LetoDMS_Core_AttributeDefinition::objtype_all));
+	if($attrdefs) {
+		foreach($attrdefs as $attrdef) {
+?>
+<tr>
+	<td><?php echo htmlspecialchars($attrdef->getName()); ?></td>
+	<td><?php UI::printAttributeEditField($attrdef, '') ?></td>
+</tr>
+<?php
+		}
+	}
+?>
 		<tr>
 			<td colspan="2"><br><input type="Submit" value="<?php printMLText("add_subfolder");?>"></td>
 		</tr>