--- webform-original.module	2007-10-02 16:57:02.000000000 +0300
+++ webform.module	2007-10-02 17:02:22.000000000 +0300
@@ -135,7 +135,7 @@
 function webform_load($node) {
   // load 
   $page= db_fetch_object(db_query("SELECT * FROM {webform} WHERE nid = %d", $node->nid));
-  $result= db_query('SELECT * FROM {webform_component} WHERE nid = %d ORDER BY weight, name', $node->nid);
+  $result= db_query('SELECT wc1.* FROM webform_component wc1 LEFT JOIN webform_component wc2 ON (wc1.pid = wc2.cid OR wc1.cid = wc2.cid) WHERE wc1.nid = %d AND  wc2.type = "fieldset" ORDER BY wc2.weight, wc1.weight, wc1.name', $node->nid);
   while ($c= db_fetch_array($result)) {
     $page->webformcomponents[$c['cid']]['cid']= $c['cid'];
     $page->webformcomponents[$c['cid']]['form_key']= $c['form_key'] ? $c['form_key'] : $c['cid'];