Index: ChangeLog
===================================================================
--- ChangeLog	(Revision 9736)
+++ ChangeLog	(Revision 9737)
@@ -32,6 +32,7 @@
 
 	* Fixed Bug #16613: CleanUp alt_db_navframe.php to work with new workspaces module
 	* Fixed Bug #16218: TCE-Forms does not use sprite icons -- this leads to inconsistency
+	* Fixed Bug #16635: TCA Tree does not save collapse/expand state
 
 2010-12-01  Sebastian Kurfuerst  <sebastian@typo3.org>
 
Index: t3lib/tceforms/class.t3lib_tceforms_tree.php
===================================================================
--- t3lib/tceforms/class.t3lib_tceforms_tree.php	(Revision 9736)
+++ t3lib/tceforms/class.t3lib_tceforms_tree.php	(Revision 9737)
@@ -168,7 +168,13 @@
 							node.getUI().toggleCheck(node.attributes.checked);
 						}
 					},
-					checkchange: TYPO3.Components.Tree.TcaCheckChangeHandler
+					checkchange: TYPO3.Components.Tree.TcaCheckChangeHandler,
+					collapsenode: function(node) {
+						top.TYPO3.BackendUserSettings.ExtDirect.removeFromList("tcaTrees." + this.ucId, node.attributes.uid);
+					},
+					expandnode: function(node) {
+						top.TYPO3.BackendUserSettings.ExtDirect.addToList("tcaTrees." + this.ucId, node.attributes.uid);
+					}
 				},
 				tcaMaxItems: ' . ($PA['fieldConf']['config']['maxitems'] ? intval($PA['fieldConf']['config']['maxitems']) : 99999) . ',
 				tcaExclusiveKeys: "' . (