diff --git a/CHANGELOG b/CHANGELOG
index 6dae58fee..ed43b14bc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,8 @@
 - major overhaul of notifications
 - check view access for FolderAccess and DocumentAccess
 - more settings to disable import and download of extensions
+- add new configuration for excluding sequence and comment when creating
+  a folder
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.23
diff --git a/out/out.EditFolder.php b/out/out.EditFolder.php
index 0ad1245d7..85e4be781 100644
--- a/out/out.EditFolder.php
+++ b/out/out.EditFolder.php
@@ -54,6 +54,7 @@ if($view) {
 	$view->setParam('folder', $folder);
 	$view->setParam('attrdefs', $attrdefs);
 	$view->setParam('strictformcheck', $settings->_strictFormCheck);
+	$view->setParam('nofolderformfields', $settings->_noFolderFormFields);
 	$view->setParam('rootfolderid', $settings->_rootFolderID);
 	$view->setParam('orderby', $settings->_sortFoldersDefault);
 	$view->setParam('accessobject', $accessop);
diff --git a/views/bootstrap/class.EditFolder.php b/views/bootstrap/class.EditFolder.php
index 4f15a6de4..4a44d5c2b 100644
--- a/views/bootstrap/class.EditFolder.php
+++ b/views/bootstrap/class.EditFolder.php
@@ -54,6 +54,7 @@ $(document).ready(function() {
 		$attrdefs = $this->params['attrdefs'];
 		$rootfolderid = $this->params['rootfolderid'];
 		$strictformcheck = $this->params['strictformcheck'];
+		$nofolderformfields = $this->params['nofolderformfields'];
 		$orderby = $this->params['orderby'];
 
 		$this->htmlAddHeader('<script type="text/javascript" src="../views/'.$this->theme.'/vendors/jquery-validation/jquery.validate.js"></script>'."\n", 'js');
@@ -81,22 +82,35 @@ $(document).ready(function() {
 				'required'=>true
 			)
 		);
-		$this->formField(
-			getMLText("comment"),
-			array(
-				'element'=>'textarea',
-				'name'=>'comment',
-				'rows'=>4,
-				'cols'=>80,
-				'value'=>htmlspecialchars($folder->getComment()),
-				'required'=>$strictformcheck
-			)
-		);
-		$parent = ($folder->getID() == $rootfolderid) ? false : $folder->getParent();
-		if ($parent && $parent->getAccessMode($user) > M_READ) {
-			$this->formField(getMLText("sequence"), $this->getSequenceChooser($parent->getSubFolders('s'), $folder->getID()).($orderby != 's' ? "<br />".getMLText('order_by_sequence_off') : ''));
+		if(!$nofolderformfields || !in_array('comment', $nofolderformfields)) {
+			$this->formField(
+				getMLText("comment"),
+				array(
+					'element'=>'textarea',
+					'name'=>'comment',
+					'rows'=>4,
+					'cols'=>80,
+					'value'=>htmlspecialchars($folder->getComment()),
+					'required'=>$strictformcheck
+				)
+			);
+		} else {
+			$this->formField(
+				null,
+				array(
+					'element'=>'input',
+					'type'=>'hidden',
+					'name'=>'comment',
+					'value'=>htmlspecialchars($folder->getComment()),
+				)
+			);
+		}
+		$parent = ($folder->getID() == $rootfolderid) ? false : $folder->getParent();
+		if(!$nofolderformfields || !in_array('sequence', $nofolderformfields)) {
+			if ($parent && $parent->getAccessMode($user) > M_READ) {
+				$this->formField(getMLText("sequence"), $this->getSequenceChooser($parent->getSubFolders('s'), $folder->getID()).($orderby != 's' ? "<br />".getMLText('order_by_sequence_off') : ''));
+			}
 		}
-
 		if($attrdefs) {
 			foreach($attrdefs as $attrdef) {
 				$arr = $this->callHook('editFolderAttribute', $folder, $attrdef);