--- expresso/emailadmin/templates/default/editprofile.tpl	2010-08-23 07:53:51.000000000 -0300
+++ expresso/emailadmin/templates/default/editprofileALT.tpl	2010-08-23 07:53:03.000000000 -0300
@@ -273,6 +273,14 @@
 					<input type="checkbox" name="imapsettings[2][imapoldcclient]" {selected_imapoldcclient} value="yes">
 				</td>
 			</tr>
+
+                        <tr class="row_off">
+                                <td class="td_left">{lang_imap_max_folders}:</td>
+                                <td class="td_right">
+					<input name="imapsettings[2][imapMaxFolders]" maxlength="5" size="5" value="{value_imapMaxFolders}">
+				</td>
+                        </tr>
+
 		</table>
 	</div>
 	
@@ -332,6 +340,14 @@
 					<input type="checkbox" name="imapsettings[3][imapoldcclient]" {selected_imapoldcclient} value="yes">
 				</td>
 			</tr>
+
+			<tr class="row_off">
+                                <td class="td_left">{lang_imap_max_folders}:</td>
+                                <td class="td_right">
+					<input name="imapsettings[3][imapMaxFolders]" maxlength="5" size="5" value="{value_imapMaxFolders}">
+				</td>
+                        </tr>
+
 		</table>
 		<table>
 			<tr>
--- expresso/emailadmin/setup/tables_current.inc.php	2010-08-23 07:53:51.000000000 -0300
+++ expresso/emailadmin/setup/tables_current.incALT.php	2010-08-23 08:01:07.000000000 -0300
@@ -45,7 +45,8 @@
 				'userDefinedAccounts' => array('type' => 'varchar','precision' => '3'),
 				'imapCreateSpamFolder' => array('type' => 'varchar','precision' => '3'),
 				'imapCyrusUserPostSpam' => array('type' => 'varchar','precision' => '30'),
-				'imapoldcclient' => array('type' => 'varchar','precision' => '3')
+				'imapoldcclient' => array('type' => 'varchar','precision' => '3'),
+				'imapMaxFolders' => array('type' => 'varchar','precision' => '5')
 			),
 			'pk' => array('profileID'),
 			'fk' => array(),
--- expresso/emailadmin/setup/tables_update.inc.php	2010-08-23 07:53:51.000000000 -0300
+++ expresso/emailadmin/setup/tables_update.incALT.php	2010-08-23 08:04:13.000000000 -0300
@@ -109,4 +109,11 @@
       $GLOBALS['setup_info']['emailadmin']['currentver'] = '2.2.000';
       return $GLOBALS['setup_info']['emailadmin']['currentver'];
    }
+   $test[] = '2.2.000';
+   function emailadmin_upgrade2_2000()
+        {
+      $GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_emailadmin','imapmaxfolders', array('type' => 'varchar', 'precision' => 5));
+      $GLOBALS['setup_info']['emailadmin']['currentver'] = '2.2.001';
+      return $GLOBALS['setup_info']['emailadmin']['currentver'];
+   }
 ?>
\ No newline at end of file
--- expresso/emailadmin/setup/setup.inc.php	2010-08-23 07:53:51.000000000 -0300
+++ expresso/emailadmin/setup/setup.incALT.php	2010-08-23 08:06:47.000000000 -0300
@@ -13,7 +13,7 @@
 
 	$setup_info['emailadmin']['name']      = 'emailadmin';
 	$setup_info['emailadmin']['title']     = 'EMailAdmin';
-	$setup_info['emailadmin']['version']   = '2.2.000';
+	$setup_info['emailadmin']['version']   = '2.2.001';
 	$setup_info['emailadmin']['app_order'] = 10;
 	$setup_info['emailadmin']['enable']    = 2;
 
--- expresso/emailadmin/setup/phpgw_pt-br.lang	2010-08-23 07:53:51.000000000 -0300
+++ expresso/emailadmin/setup/phpgw_pt-brALT.lang	2010-08-24 00:53:20.000000000 -0300
@@ -28,6 +28,7 @@
 imap admin password	admin	pt-br	Senha do administrador IMAP
 imap admin user	admin	pt-br	Usuário administrador do IMAP
 imap c-client version < 2001	emailadmin	pt-br	IMAP C-Cliente Versão < 2001
+imap max folders	emailadmin	pt-br	Exibição máxima de pastas IMAP
 imap/pop3 server name	emailadmin	pt-br	Nome do servidor IMAP/POP3
 imap server hostname or ip address	emailadmin	pt-br	Nome ou IP do servidor IMAP
 imap server logintyp	emailadmin	pt-br	Tipo de login do servidor IMAP
--- expresso/expressoMail1_2/inc/class.imap_functions.inc.php	2010-08-23 07:53:51.000000000 -0300
+++ expresso/expressoMail1_2/inc/class.imap_functions.incALT.php	2010-08-24 00:43:02.000000000 -0300
@@ -27,7 +27,7 @@
 	var $imap_sentfolder;
 
 	function imap_functions (){
-		$this->foldersLimit = 200; //Limit of folders (mailboxes) user can see
+		$this->foldersLimit = $_SESSION['phpgw_info']['expressomail']['email_server']['imapMaxFolders'] ? $_SESSION['phpgw_info']['expressomail']['email_server']['imapMaxFolders'] : 200 ;
 	 	$this->username 	  = $_SESSION['phpgw_info']['expressomail']['user']['userid'];
 		$this->password 	  = $_SESSION['phpgw_info']['expressomail']['user']['passwd'];
 		$this->imap_server	  = $_SESSION['phpgw_info']['expressomail']['email_server']['imapServer'];