diff --git a/mail/inc/class.mail_hooks.inc.php b/mail/inc/class.mail_hooks.inc.php
index 40688c01d1..2e5917629f 100644
--- a/mail/inc/class.mail_hooks.inc.php
+++ b/mail/inc/class.mail_hooks.inc.php
@@ -193,22 +193,6 @@ class mail_hooks
 			'asmail' => lang('forward as attachment'),
 			'inline' => lang('forward inline'),
 		);
-		$gridViewBehavior = array(
-			'0' => lang('use common preferences max. messages'),
-			'5'	=> 5,
-			'10'=> 10,
-			'15'=> 15,
-			'20'=> 20,
-			'25'=> 25,
-			'50'=> 50,
-			'75'=> 75,
-			'100'=> 100,
-			'200'=> 200,
-			'250'=> 250,
-			'500'=> 500,
-			'999'=> 999,
-			'-1' => lang('show all messages'),
-		);
 		$sortOrder = array(
 			'0' => lang('date(newest first)'),
 			'1' => lang('date(oldest first)'),
@@ -443,16 +427,6 @@ class mail_hooks
 				'admin'  => False,
 				'default'=> 'mail',
 			),
-			'prefMailGridBehavior' => array(
-				'type'   => 'select',
-				'label'  => 'how many messages should the mail list load',
-				'help'   => 'If you select all messages there will be no pagination for mail message list. Beware, as some actions on all selected messages may be problematic depending on the amount of selected messages.',
-				'name'   => 'prefMailGridBehavior',
-				'values' =>	$gridViewBehavior,
-				'xmlrpc' => True,
-				'admin'  => False,
-				'default'=> 50,
-			),
 			'enablePreViewArea' => array(
 				'type'   => 'select',
 				'label'  => 'Message preview area',
@@ -812,7 +786,7 @@ class mail_hooks
 		// Destination div for folder tree
 		$file[] = array(
 			'no_lang' => true,
-			'text'=>'<span id="tree_target" class="dtree" style="width:100%;"/>',
+			'text'=>'<span id="tree_target" class="dtree" />',
 			'link'=>false,
 			'icon' => false
 		);
diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 9b9fffd1e3..fb158fedf5 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -322,8 +322,6 @@ class mail_ui
 		if (is_object($preferences)) $activeIdentity =& $preferences->getIdentity($icServerID, true);
 		//_debug_array($activeIdentity);
 		$maxMessages	=  50;
-		if (isset($GLOBALS['egw_info']['user']['preferences']['mail']['prefMailGridBehavior']) && (int)$GLOBALS['egw_info']['user']['preferences']['mail']['prefMailGridBehavior'] <> 0)
-			$maxMessages = (int)$GLOBALS['egw_info']['user']['preferences']['mail']['prefMailGridBehavior'];
 		$userPreferences	=&  $GLOBALS['egw_info']['user']['preferences']['mail'];
 
 		// retrieve data for/from user defined accounts
@@ -933,8 +931,6 @@ unset($query['actions']);
 		//error_log(__METHOD__.__LINE__.' Folder:'.array2string($_folderName).' FolderType:'.$folderType.' RowsFetched:'.array2string($rowsFetched)." these Uids:".array2string($uidOnly).' Headers passed:'.array2string($headers));
 		$this->mail_bo->restoreSessionData();
 		$maxMessages = 50; // match the hardcoded setting for data retrieval as inital value
-		if (isset($this->mail_bo->mailPreferences->preferences['prefMailGridBehavior']) && (int)$this->mail_bo->mailPreferences->preferences['prefMailGridBehavior'] <> 0)
-			$maxMessages = (int)$this->mail_bo->mailPreferences->preferences['prefMailGridBehavior'];
 		$previewMessage = $this->mail_bo->sessionData['previewMessage'];
 		if (isset($query['selectedFolder'])) $this->mail_bo->sessionData['maibox']=$query['selectedFolder'];
 		$this->mail_bo->saveSessionData();
diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index bf60dc9fcd..7b89b24616 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -217,6 +217,23 @@ pre {
  width: 99%; 
 }
 
+/*
+ avoid the vertical scrollbar within the sidebox section (triggered by the vertical dimension of the tree)
+*/
+.divSidebox {
+	overflow: hidden;
+}
+.textSidebox {
+	overflow-x: hidden;
+	overflow-y: auto;
+}
+/*
+ avoid the vertical scrollbar within the actual tablecontainer (of the tree)
+*/
+.containerTableStyle {
+	width: 100%;
+	overflow: hidden;
+}
 .dtree {
 	font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
 	font-size: 11px;
@@ -255,22 +272,13 @@ pre {
  influence the tree display and scrolling behavior
 */
 #tree_target {
-	width: 100%;
+	min-height: 35px;
 	max-height: 450px;
-	display: inline-block;
-	overflow: none;
-	overflow-y: auto;
-}
-/*
- avoid the vertical scrollbar within the sidebox section (triggered by the vertical dimension of the tree)
-*/
-.divSidebox {
-	overflow: hidden;
-}
-/*
- avoid the vertical scrollbar within the actual tablecontainer (of the tree)
-*/
-.containerTableStyle {
+	display: block;
+	display: -moz-inline-stack;
+	display: -moz-box;
 	width: 100%;
 	overflow: hidden;
+	overflow-y: auto;
+	z-index:100;
 }