diff --git a/admin/survey/classes/class.SurveyListFolders.php b/admin/survey/classes/class.SurveyListFolders.php
index de3805e59..b843bc65b 100644
--- a/admin/survey/classes/class.SurveyListFolders.php
+++ b/admin/survey/classes/class.SurveyListFolders.php
@@ -9,9 +9,6 @@ class SurveyListFolders {
 
 
     private $current_folder = 0;        // Trenutni odprt folder
-    private $active_folders = array();  // Seznam odprtih folderjev
-
-    private $surveys_list = array();    // Seznam anket v odprtem folderju
     private $folders_list = array();    // Seznam vseh folderjev uporabnika
 
     private $pageno = 1;                // Trenutna stran (paginacija)
@@ -20,17 +17,26 @@ class SurveyListFolders {
 	public function __construct() {
 		global $admin_type, $global_user_id, $site_path;
 
-        // Nastavimo trenuten folder
-        $this->current_folder = isset($_SESSION['survey_list_folders']['current_folder']) ? $_SESSION['survey_list_folders']['current_folder'] : 0;
+        $sql = sisplet_query("SELECT f.*, COUNT(a.ank_id) AS survey_count
+                                FROM srv_mysurvey_folder f
+                                    LEFT JOIN srv_mysurvey_anketa a
+                                    ON f.id=a.folder
+                                WHERE f.usr_id='".$global_user_id."'
+                                GROUP BY 1
+                                ORDER BY f.naslov ASC
+                            ");
+        if (!$sql) {
+            echo mysqli_error($GLOBALS['connect_db']);
+        }
 
-        // Nastavimo odprte folderje
-        $this->active_folders = isset($_SESSION['survey_list_folders']['active_folders']) ? $_SESSION['survey_list_folders']['current_folder'] : array();
+        while($row = mysqli_fetch_array($sql)){
+            
+            $this->folders_list[$row['id']] = $row;
 
-
-        // Pridobimo seznam folderjev uporabnika
-
-
-        // Pridobimo seznam anket v odprtem folderju
+            // Nastavimo, ce je to trenutno odprt folder
+            if($row['active'] == '1')
+                $this->current_folder = $row['id'];
+        }
 	}
 			
 
@@ -62,16 +68,16 @@ class SurveyListFolders {
         echo '<div class="title">Vaše mape</div>';
 
         // Izpisemo seznam folder s seznamom childov v rootu
-        $this->displayFolderList();
+        $this->displayFolderList(0);
     } 
 
     // Izpisemo seznam folderjev za posameznega parenta
-    private function displayFolderList(){
-
-        echo '<ul class="folder_list">';
+    private function displayFolderList($folder_id){
         
         $this->displayFolder();
 
+        echo '<ul class="folder_list">';
+
         echo '</ul>';
     }
 
@@ -170,6 +176,33 @@ class SurveyListFolders {
         }
     }
 
+    // Prikazemo preklop med navadnim pogledom in pogledom s folderji
+	private function displayFolderSwitch(){			
+        global $lang, $global_user_id;
+        
+        // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
+        $userAccess = UserAccess::getInstance($global_user_id);
+        
+        // Ce ni na voljo
+        if(!$userAccess->checkUserAccess('my_survey_folders')){
+            echo '<div title="'.$lang['srv_mySurvey_show_folders_desc'].'" id="folderSwitch" class="user_access_locked" onClick="popupUserAccess(\'my_survey_folders\');">';
+            echo $lang['srv_mySurvey_show_folders'];
+		    echo '</div>';
+        }
+        else{
+            echo '<div title="'.$lang['srv_mySurvey_show_folders_desc'].'" id="folderSwitch" onClick="switchFolder(\''.$this->show_folders.'\');">';
+            echo '  <span>'.$lang['srv_mySurvey_show_folders'].'</span>';
+
+            // Stikalo za folderje
+            if($this->show_folders == 1)
+                echo '  <div class="switch_folders on"></div>';
+            else
+                echo '  <div class="switch_folders off"></div>';
+
+		    echo '</div>';
+        }	
+	}
+
     // Prikazemo gumb za sortiranje seznama anket
 	private function displaySortButton(){
 		global $lang, $site_url;
@@ -257,6 +290,22 @@ class SurveyListFolders {
 		echo '</div>';
 	}
 
+    // Prikazemo search okno za iskanje po anketah
+	public function displaySearch(){
+		global $lang;
+		global $site_url;
+		
+		echo '<form method="GET" id="1kasmysurvey" action="'.$site_url.'admin/survey/index.php">';      
+	    
+        echo '<input id="searchMySurvey" type="text" value="" placeholder="'.$lang['s_search_mySurvey'].'" name="search" />';
+		
+		echo '	<button class="medium white-black" onclick="$(\'#1kasmysurvey\').submit(); return false;">';
+		echo $lang['s_search2'];
+		echo '	</button>';
+          		
+		echo '</form>';
+	}
+
     // Izpisemo tabelo z anketami v folderju
     private function displaySurveyTable(){
         
@@ -841,32 +890,7 @@ class SurveyListFolders {
 	
 	
 	
-	// Prikazemo preklop med navadnim pogledom in pogledom s folderji
-	private function displayFolderSwitch(){			
-        global $lang, $global_user_id;
-        
-        // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik
-        $userAccess = UserAccess::getInstance($global_user_id);
-        
-        // Ce ni na voljo
-        if(!$userAccess->checkUserAccess('my_survey_folders')){
-            echo '<div title="'.$lang['srv_mySurvey_show_folders_desc'].'" id="folderSwitch" class="user_access_locked" onClick="popupUserAccess(\'my_survey_folders\');">';
-            echo $lang['srv_mySurvey_show_folders'];
-		    echo '</div>';
-        }
-        else{
-            echo '<div title="'.$lang['srv_mySurvey_show_folders_desc'].'" id="folderSwitch" onClick="switchFolder(\''.$this->show_folders.'\');">';
-            echo '  <span>'.$lang['srv_mySurvey_show_folders'].'</span>';
-
-            // Stikalo za folderje
-            if($this->show_folders == 1)
-                echo '  <div class="switch_folders on"></div>';
-            else
-                echo '  <div class="switch_folders off"></div>';
-
-		    echo '</div>';
-        }	
-	}
+	
 	
 	private function displaySettingsUrl() {
 		global $lang;
@@ -996,21 +1020,6 @@ class SurveyListFolders {
         echo '</form>';
 	}
 	
-	// Prikazemo search okno za iskanje po anketah
-	public function displaySearch(){
-		global $lang;
-		global $site_url;
-		
-		echo '<form method="GET" id="1kasmysurvey" action="'.$site_url.'admin/survey/index.php">';      
-	    
-        echo '<input id="searchMySurvey" type="text" value="" placeholder="'.$lang['s_search_mySurvey'].'" name="search" />';
-		
-		echo '	<button class="medium white-black" onclick="$(\'#1kasmysurvey\').submit(); return false;">';
-		echo $lang['s_search2'];
-		echo '	</button>';
-          		
-		echo '</form>';
-	}
 	
 	
 	/** polovimo nastavitve prikaza za posameznega uporabnika
diff --git a/sql/update2.sql b/sql/update2.sql
index 42f1d9856..61dd352b8 100644
--- a/sql/update2.sql
+++ b/sql/update2.sql
@@ -9660,3 +9660,7 @@ UPDATE misc SET value='22.08.05' WHERE what="version";
 INSERT INTO srv_misc (what, value) VALUES ('pc_tables', '0');
 
 UPDATE misc SET value='22.08.25' WHERE what="version";
+
+ALTER TABLE srv_mysurvey_folder ADD active enum('0','1') NOT NULL DEFAULT '0';
+
+UPDATE misc SET value='22.10.04' WHERE what="version";