Index: /sandbox/expressoMail1_2/MailArchiver/2.2/phpgwapi/js/browser/browserDetect.js
===================================================================
--- /sandbox/expressoMail1_2/MailArchiver/2.2/phpgwapi/js/browser/browserDetect.js	(revision 4644)
+++ /sandbox/expressoMail1_2/MailArchiver/2.2/phpgwapi/js/browser/browserDetect.js	(revision 5035)
@@ -65,4 +65,5 @@
             ['firefox4', ( agt.indexOf('firefox/4') != -1 ) ],
             ['firefox5', ( agt.indexOf('firefox/5') != -1 ) ],
+            ['firefox6', ( agt.indexOf('firefox/6') != -1 ) ],
             
 
Index: /sandbox/expressoMail1_2/MailArchiver/2.2/news_admin/templates/default/fckeditor/editor/js/fckeditorcode_gecko.js
===================================================================
--- /sandbox/expressoMail1_2/MailArchiver/2.2/news_admin/templates/default/fckeditor/editor/js/fckeditorcode_gecko.js	(revision 1257)
+++ /sandbox/expressoMail1_2/MailArchiver/2.2/news_admin/templates/default/fckeditor/editor/js/fckeditorcode_gecko.js	(revision 5035)
@@ -36,5 +36,5 @@
 FCK.Description="FCKeditor for Gecko Browsers";FCK.InitializeBehaviors=function(){Window_OnResize();FCKFocusManager.AddWindow(this.EditorWindow);var A=function(e){var B;if (e.ctrlKey&&!e.shiftKey&&!e.altKey){switch (e.which){case 66:case 98:FCK.ExecuteNamedCommand('bold');B=true;break;case 105:case 73:FCK.ExecuteNamedCommand('italic');B=true;break;case 117:case 85:FCK.ExecuteNamedCommand('underline');B=true;break;case 86:case 118:B=(FCK.Status!=FCK_STATUS_COMPLETE||!FCK.Events.FireEvent("OnPaste"));break;}}else if (e.shiftKey&&!e.ctrlKey&&!e.altKey&&e.keyCode==45) B=(FCK.Status!=FCK_STATUS_COMPLETE||!FCK.Events.FireEvent("OnPaste"));if (B){e.preventDefault();e.stopPropagation();}};this.EditorDocument.addEventListener('keypress',A,true);this.ExecOnSelectionChange=function(){FCK.Events.FireEvent("OnSelectionChange");};this.ExecOnSelectionChangeTimer=function(){if (FCK.LastOnChangeTimer) window.clearTimeout(FCK.LastOnChangeTimer);FCK.LastOnChangeTimer=window.setTimeout(FCK.ExecOnSelectionChange,100);};this.EditorDocument.addEventListener('mouseup',this.ExecOnSelectionChange,false);this.EditorDocument.addEventListener('keyup',this.ExecOnSelectionChangeTimer,false);this._DblClickListener=function(e){FCK.OnDoubleClick(e.target);e.stopPropagation();};this.EditorDocument.addEventListener('dblclick',this._DblClickListener,true);FCK.ContextMenu._InnerContextMenu.SetMouseClickWindow(FCK.EditorWindow);FCK.ContextMenu._InnerContextMenu.AttachToElement(FCK.EditorDocument);};FCK.MakeEditable=function(){this.EditingArea.MakeEditable();};function Document_OnContextMenu(e){if (!e.target._FCKShowContextMenu) e.preventDefault();};document.oncontextmenu=Document_OnContextMenu;
 FCK.RedirectNamedCommands=new Object();FCK.ExecuteNamedCommand=function(A,B,C){FCKUndo.SaveUndoStep();if (!C&&FCK.RedirectNamedCommands[A]!=null) FCK.ExecuteRedirectedNamedCommand(A,B);else{FCK.Focus();FCK.EditorDocument.execCommand(A,false,B);FCK.Events.FireEvent('OnSelectionChange');};FCKUndo.SaveUndoStep();};FCK.GetNamedCommandState=function(A){try{if (!FCK.EditorDocument.queryCommandEnabled(A)) return FCK_TRISTATE_DISABLED;else return FCK.EditorDocument.queryCommandState(A)?FCK_TRISTATE_ON:FCK_TRISTATE_OFF;}catch (e){return FCK_TRISTATE_OFF;}};FCK.GetNamedCommandValue=function(A){var B='';var C=FCK.GetNamedCommandState(A);if (C==FCK_TRISTATE_DISABLED) return null;try{B=this.EditorDocument.queryCommandValue(A);}catch(e) {};return B?B:'';};FCK.PasteFromWord=function(){FCKDialog.OpenDialog('FCKDialog_Paste',FCKLang.PasteFromWord,'dialog/fck_paste.html',400,330,'Word');};FCK.Preview=function(){var A=FCKConfig.ScreenWidth*0.8;var B=FCKConfig.ScreenHeight*0.7;var C=(FCKConfig.ScreenWidth-A)/2;var D=window.open('',null,'toolbar=yes,location=no,status=yes,menubar=yes,scrollbars=yes,resizable=yes,width='+A+',height='+B+',left='+C);var E;if (FCKConfig.FullPage){if (FCK.TempBaseTag.length>0) E=FCK.TempBaseTag+FCK.GetXHTML();else E=FCK.GetXHTML();}else{E=FCKConfig.DocType+'<html dir="'+FCKConfig.ContentLangDirection+'">'+'<head>'+FCK.TempBaseTag+'<title>'+FCKLang.Preview+'</title>'+FCK._GetEditorAreaStyleTags()+'</head><body>'+FCK.GetXHTML()+'</body></html>';};D.document.write(E);D.document.close();};FCK.SwitchEditMode=function(A){var B=(FCK.EditMode==FCK_EDITMODE_WYSIWYG);var C;if (B){if (!A&&FCKBrowserInfo.IsIE) FCKUndo.SaveUndoStep();C=FCK.GetXHTML(FCKConfig.FormatSource);}else C=this.EditingArea.Textarea.value;FCK.EditMode=B?FCK_EDITMODE_SOURCE:FCK_EDITMODE_WYSIWYG;FCK.SetHTML(C);FCK.Focus();FCKTools.RunFunction(FCK.ToolbarSet.RefreshModeState,FCK.ToolbarSet);};FCK.CreateElement=function(A){var e=FCK.EditorDocument.createElement(A);return FCK.InsertElementAndGetIt(e);};FCK.InsertElementAndGetIt=function(e){e.setAttribute('FCKTempLabel','true');this.InsertElement(e);var A=FCK.EditorDocument.getElementsByTagName(e.tagName);for (var i=0;i<A.length;i++){if (A[i].getAttribute('FCKTempLabel')){A[i].removeAttribute('FCKTempLabel');return A[i];}};return null;};
-FCK._BaseGetNamedCommandState=FCK.GetNamedCommandState;FCK.GetNamedCommandState=function(A){switch (A){case 'Unlink':return FCKSelection.HasAncestorNode('A')?FCK_TRISTATE_OFF:FCK_TRISTATE_DISABLED;default:return FCK._BaseGetNamedCommandState(A);}};FCK.RedirectNamedCommands={Print:true,Paste:true,Cut:true,Copy:true};FCK.ExecuteRedirectedNamedCommand=function(A,B){switch (A){case 'Print':FCK.EditorWindow.print();break;case 'Paste':try			{ if (FCK.Paste()) FCK.ExecuteNamedCommand('Paste',null,true);}catch (e)	{ alert(FCKLang.PasteErrorPaste);};break;case 'Cut':try			{ FCK.ExecuteNamedCommand('Cut',null,true);}catch (e)	{ alert(FCKLang.PasteErrorCut);};break;case 'Copy':try			{ FCK.ExecuteNamedCommand('Copy',null,true);}catch (e)	{ alert(FCKLang.PasteErrorCopy);};break;default:FCK.ExecuteNamedCommand(A,B);}};FCK.AttachToOnSelectionChange=function(A){this.Events.AttachEvent('OnSelectionChange',A);};FCK.Paste=function(){if (FCKConfig.ForcePasteAsPlainText){FCK.PasteAsPlainText();return false;}else return true;};FCK.InsertHtml=function(A){A=FCKConfig.ProtectedSource.Protect(A);A=FCK.ProtectUrls(A);var B=FCKSelection.Delete();var C=B.getRangeAt(0);var D=C.createContextualFragment(A);var E=D.lastChild;C.insertNode(D);FCKSelection.SelectNode(E);FCKSelection.Collapse(false);this.Focus();};FCK.InsertElement=function(A){var B=FCKSelection.Delete();var C=B.getRangeAt(0);C.insertNode(A);FCKSelection.SelectNode(A);FCKSelection.Collapse(false);this.Focus();};FCK.PasteAsPlainText=function(){FCKDialog.OpenDialog('FCKDialog_Paste',FCKLang.PasteAsText,'dialog/fck_paste.html',400,330,'PlainText');};FCK.GetClipboardHTML=function(){return '';};FCK.CreateLink=function(A){FCK.ExecuteNamedCommand('Unlink');if (A.length>0){var B='javascript:void(0);/*'+(new Date().getTime())+'*/';FCK.ExecuteNamedCommand('CreateLink',B);var C=document.evaluate("//a[@href='"+B+"']",this.EditorDocument.body,null,9,null).singleNodeValue;if (C){C.href=A;return C;}}};
+FCK._BaseGetNamedCommandState=FCK.GetNamedCommandState;FCK.GetNamedCommandState=function(A){switch (A){case 'Unlink':return FCKSelection.HasAncestorNode('A')?FCK_TRISTATE_OFF:FCK_TRISTATE_DISABLED;default:return FCK._BaseGetNamedCommandState(A);}};FCK.RedirectNamedCommands={Print:true,Paste:true,Cut:true,Copy:true};FCK.ExecuteRedirectedNamedCommand=function(A,B){switch (A){case 'Print':FCK.EditorWindow.print();break;case 'Paste':try			{ if (FCK.Paste()) FCK.ExecuteNamedCommand('Paste',null,true);}catch (e)	{ alert(FCKLang.PasteErrorPaste);};break;case 'Cut':try			{ FCK.ExecuteNamedCommand('Cut',null,true);}catch (e)	{ alert(FCKLang.PasteErrorCut);};break;case 'Copy':try			{ FCK.ExecuteNamedCommand('Copy',null,true);}catch (e)	{ alert(FCKLang.PasteErrorCopy);};break;default:FCK.ExecuteNamedCommand(A,B);}};FCK.AttachToOnSelectionChange=function(A){this.Events.AttachEvent('OnSelectionChange',A);};FCK.Paste=function(){if (FCKConfig.ForcePasteAsPlainText){FCK.PasteAsPlainText();return false;}else return true;};FCK.InsertHtml=function(A){A=FCKConfig.ProtectedSource.Protect(A);A=FCK.ProtectUrls(A);var B=FCKSelection.Delete();var C=B.getRangeAt(0);var D=C.createContextualFragment(A);var E=D.lastChild;C.insertNode(D);FCKSelection.SelectNode(E);FCKSelection.Collapse(false);this.Focus();};FCK.InsertElement=function(A){var B=FCKSelection.Delete();var C=B.getRangeAt(0);C.insertNode(A);FCKSelection.SelectNode(A);FCKSelection.Collapse(false);this.Focus();};FCK.PasteAsPlainText=function(){FCKDialog.OpenDialog('FCKDialog_Paste',FCKLang.PasteAsText,'dialog/fck_paste.html',400,330,'PlainText');};FCK.GetClipboardHTML=function(){return '';};FCK.CreateLink=function(A){FCK.ExecuteNamedCommand('Unlink');if (A.length>0){var B='javascript:void(0);/*'+(new Date().getTime())+'*/';FCK.ExecuteNamedCommand('CreateLink',B);var C=this.EditorDocument.evaluate("//a[@href='"+B+"']",this.EditorDocument.body,null,9,null).singleNodeValue;if (C){C.href=A;return C;}}};
 var FCKSelection=FCK.Selection=new Object();
 FCKSelection.GetType=function(){this._Type='Text';var A;try { A=FCK.EditorWindow.getSelection();}catch (e) {};if (A&&A.rangeCount==1){var B=A.getRangeAt(0);if (B.startContainer==B.endContainer&&(B.endOffset-B.startOffset)==1&&B.startContainer.nodeType!=Node.TEXT_NODE) this._Type='Control';};return this._Type;};FCKSelection.GetSelectedElement=function(){if (this.GetType()=='Control'){var A=FCK.EditorWindow.getSelection();return A.anchorNode.childNodes[A.anchorOffset];}};FCKSelection.GetParentElement=function(){if (this.GetType()=='Control') return FCKSelection.GetSelectedElement().parentNode;else{var A=FCK.EditorWindow.getSelection();if (A){var B=A.anchorNode;while (B&&B.nodeType!=1) B=B.parentNode;return B;}}};FCKSelection.SelectNode=function(A){var B=FCK.EditorDocument.createRange();B.selectNode(A);var C=FCK.EditorWindow.getSelection();C.removeAllRanges();C.addRange(B);};FCKSelection.Collapse=function(A){var B=FCK.EditorWindow.getSelection();if (A==null||A===true) B.collapseToStart();else B.collapseToEnd();};FCKSelection.HasAncestorNode=function(A){var B=this.GetSelectedElement();if (!B&&FCK.EditorWindow){try		{ B=FCK.EditorWindow.getSelection().getRangeAt(0).startContainer;}catch(e){}};while (B){if (B.nodeType==1&&B.tagName==A) return true;B=B.parentNode;};return false;};FCKSelection.MoveToAncestorNode=function(A){var B;var C=this.GetSelectedElement();if (!C) C=FCK.EditorWindow.getSelection().getRangeAt(0).startContainer;while (C){if (C.tagName==A) return C;C=C.parentNode;};return null;};FCKSelection.Delete=function(){var A=FCK.EditorWindow.getSelection();for (var i=0;i<A.rangeCount;i++){A.getRangeAt(i).deleteContents();};return A;};
Index: /sandbox/expressoMail1_2/MailArchiver/2.2/reports/inc/class.uireports_logon.inc.php
===================================================================
--- /sandbox/expressoMail1_2/MailArchiver/2.2/reports/inc/class.uireports_logon.inc.php	(revision 4644)
+++ /sandbox/expressoMail1_2/MailArchiver/2.2/reports/inc/class.uireports_logon.inc.php	(revision 5035)
@@ -473,15 +473,12 @@
 			// ************ PAGINAÇÃO *******************************
 
-			// verifica se exixte usuarios no LDAP
-			$account_info = $this->functions->get_list_user_sector_logon($setordn,$contexts,0,$numacesso);
-
-			if (!count($account_info))
-			{
-				$p->set_var('message',lang('No user found'));
-				$p->parse('rows','row_empty',True);
-			}
-			else if (count($account_info))
-			{ 
-				if ($vnumacesso==0){
+
+			if ($vnumacesso==0){
+				$numreg = $this->functions->get_num_users_sector($setordn,$contexts);
+				if ($numreg==0){
+					$p->set_var('message',lang('No user found'));
+					$p->parse('rows','row_empty',True);
+				}
+				else {
 					//url do paginador 
 					$url = $GLOBALS['phpgw_info']['server']['webserver_url'].'/index.php?menuaction=reports.uireports_logon.report_logon_group_setor_print';
@@ -506,5 +503,4 @@
 	
 					// conta total dos registros
-					$numreg = count($account_info);
 					
 					// numero de registro por paginação
@@ -692,21 +688,26 @@
 					$p->set_var($vart);
 					// ************************* FIM PAGINAÇÃO ***********************							
-
-				}else{
+				}
+			}
+			else{
 				// ******** caso não for zero não vai paginar *****************
-					//url do paginador 
-					$url = $GLOBALS['phpgw_info']['server']['webserver_url'].'/index.php?menuaction=reports.uireports_logon.report_logon_group_setor_print';
-
-					// conta total dos registros
-					$numreg = count($account_info);
-
+				//url do paginador 
+				$url = $GLOBALS['phpgw_info']['server']['webserver_url'].'/index.php?menuaction=reports.uireports_logon.report_logon_group_setor_print';
+
+				// conta total dos registros
+
+				// ********** busca no LDAP as informação total e imprime ****************
+				$paginas =$this->functions->get_list_user_sector_logon($setordn,$contexts,0,$numacesso);
+				
+				if(count($paginas)==0) {
+					$p->set_var('message',lang('No user found'));
+					$p->parse('rows','row_empty',True);
+				}
+				else {
 					// Imprime valores de contagen de registro e pagina
-					$p->set_var('cont_user',$numreg);
+					$p->set_var('cont_user',count($paginas));
 					$p->set_var('cont_page',"1");
 					$p->set_var('page_now',"1");
-
-					// ********** busca no LDAP as informação paginada e imprime ****************
-					$paginas =$this->functions->get_list_user_sector_logon($setordn,$contexts,0,$numacesso);
-
+	
 					$tmpp = array();
 					$contap = 0;
@@ -748,5 +749,5 @@
 							}
 						}	
-
+	
 						if (count($sortp))
 						{
@@ -788,6 +789,6 @@
 						$p->parse('rows','row',True);
 					}
-					// ********************** Fim ****************************
-				}
+				}
+			// ********************** Fim ****************************
 			}
 
Index: /sandbox/expressoMail1_2/MailArchiver/2.2/reports/inc/class.functions.inc.php
===================================================================
--- /sandbox/expressoMail1_2/MailArchiver/2.2/reports/inc/class.functions.inc.php	(revision 4644)
+++ /sandbox/expressoMail1_2/MailArchiver/2.2/reports/inc/class.functions.inc.php	(revision 5035)
@@ -1111,5 +1111,23 @@
 			return $total_count;
 		}
-
+		
+		function get_num_users_sector($query, $contexts) {
+			$dn			= $GLOBALS['phpgw_info']['server']['ldap_root_dn'];
+			$passwd		= $GLOBALS['phpgw_info']['server']['ldap_root_pw'];
+			$ldap_conn	= ldap_connect($GLOBALS['phpgw_info']['server']['ldap_host']);
+			ldap_set_option($ldap_conn, LDAP_OPT_PROTOCOL_VERSION, 3);
+			ldap_set_option($ldap_conn, LDAP_OPT_REFERRALS, 0);
+			ldap_bind($ldap_conn,$dn,$passwd);
+			
+			$filter="(phpgwAccountType=u)";
+			$justthese = array("uidnumber");
+			$count = 0;
+			foreach ($contexts as $index=>$context) {
+				$search = ldap_search($ldap_conn, $query, $filter, $justthese);
+				$count+=ldap_count_entries($ldap_conn, $search);
+			}
+			return $count;
+		}
+		
 		function get_list_user_sector_logon($query, $contexts,$sizelimit,$numacesso)
 		{
Index: /sandbox/expressoMail1_2/MailArchiver/2.2/mobile/setup/phpgw_pt-br.lang
===================================================================
--- /sandbox/expressoMail1_2/MailArchiver/2.2/mobile/setup/phpgw_pt-br.lang	(revision 4778)
+++ /sandbox/expressoMail1_2/MailArchiver/2.2/mobile/setup/phpgw_pt-br.lang	(revision 5035)
@@ -109,4 +109,5 @@
 No matches found	mobile	pt-br	Contato não localizado
 The message was moved to trash	mobile	pt-br	A mensagem foi movida para a lixeira.
+The messages were deleted	mobile	pt-br	As mensagens foram apagadas.
 The messages were moved to trash	mobile	pt-br	As mensagens foram movidas para a lixeira.
 The messages were marked as seen	mobile	pt-br	As mensagens foram marcadas como lidas.
Index: /sandbox/expressoMail1_2/MailArchiver/2.2/mobile/inc/class.ui_mobilemail.inc.php
===================================================================
--- /sandbox/expressoMail1_2/MailArchiver/2.2/mobile/inc/class.ui_mobilemail.inc.php	(revision 4644)
+++ /sandbox/expressoMail1_2/MailArchiver/2.2/mobile/inc/class.ui_mobilemail.inc.php	(revision 5035)
@@ -487,7 +487,5 @@
 		function print_mails_list($messages,$print_checkbox=false)
 		{
-                        $flagImportant = intval($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_important_flag']);
-                    
-                        $functions = $this->common;
+            $functions = $this->common;
 			$p = $this->template;
 			$p->set_file( array( 'mobilemail_t' => 'mails_list.tpl' ) );
@@ -524,5 +522,5 @@
 						$flag="email-lido ";
 					
-					if( $message["Flagged"]==="F" && $flagImportant == 1 )
+					if( $message["Flagged"]==="F" )
 						$flag.="email-importante";
 					
@@ -691,4 +689,5 @@
 		function new_msg($params)
 		{
+			$flagImportant = intval($GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_important_flag']);
 			$this->template->set_file(array('new_msg_t' => 'new_msg.tpl'));
 			$this->template->set_block('new_msg_t', 'page');
@@ -704,4 +703,5 @@
 			$this->template->set_var('lang_cc', lang("cc"));
 			$this->template->set_var('lang_subject', lang("Subject"));
+			$this->template->set_var('visible_important', ( ($flagImportant == 1 ) ? "block" : "none" ) );
 			$this->template->set_var('lang_mark_as_important', lang("mark as important"));
 			$this->template->set_var('lang_read_confirmation', lang("read confirmation"));
@@ -710,5 +710,6 @@
 			$this->template->set_var("show_check_add_history","none");
 			
-			if(isset($params["error_message"])) {
+			if(isset($params["error_message"]))
+			{
 				$this->template->set_var('input_to', $_POST['input_to']);
 				$this->template->set_var('input_cc', $_POST['input_cc']);
@@ -725,7 +726,11 @@
 				
 				$GLOBALS['phpgw_info']['mobiletemplate']->set_error_msg($params["error_message"]);
-			} else {
-				if (isset($params['msg_number'])) $msg = $this->imap_functions->get_info_msg(array('msg_number' => $params['msg_number'], 'msg_folder' => $params['msg_folder'] ) );
-				
+			}
+			else
+			{
+				if (isset($params['msg_number']) )
+				{
+					$msg = $this->imap_functions->get_info_msg(array('msg_number' => $params['msg_number'], 'msg_folder' => $params['msg_folder'] ) );
+				}
 				
 				if($params['type']=="clk")
@@ -779,10 +784,16 @@
 					$params["type"] = $params['mobile_add_contact']['type'];
 				}
-				else if($params['type']=="forward"){
+				else if($params['type']=="forward")
+				{
 					$this->template->set_var('from', $msg['toaddress2']);
-	
 					$this->template->set_var('subject', "Enc:" . $msg['subject']);
-					$this->template->set_var('body_value', strip_tags($msg['body'])); // Usa a função strip_tags() para filtrar
+					
+					$_name	= ( isset($msg['from']['name']) ) ? $msg['from']['name'] : "";
+					$_email	= ( isset($msg['from']['email']) ) ? " ".$msg['from']['email']." " : "";
+					$forward_msg = "\n" . lang('At %1, %2 hours, %3 wrote:', $msg['msg_day'], $msg['msg_hour'],"\"".$_name."\"".$_email );
+						
+					// Usa a função strip_tags() para filtrar
 					// as tags que estão presentes no corpo do e-mail.
+					$this->template->set_var('body_value', "\n\n\n" . $forward_msg . "\n" . strip_tags($msg['body']) ); 
 					
 					$this->template->set_var('msg_number', $_GET['msg_number']);
@@ -792,5 +803,6 @@
 						$this->template->set_var("show_forward_attachment","block");
 						$this->template->set_block("new_msg_t","forward_attach_block");
-						foreach($msg['attachments'] as $forward_attach) {
+						foreach($msg['attachments'] as $forward_attach)
+						{
 							$value = rawurlencode(serialize(array(0=>$msg['msg_folder'],
 										   1=>$msg['msg_number'],
@@ -804,5 +816,6 @@
 					}
 				}
-				else if($params['type']=="use_draft"){
+				else if($params['type']=="use_draft")
+				{
 					$this->template->set_var('input_to', $msg['toaddress2']);
 					$this->template->set_var('input_cc', $msg['cc']);
@@ -812,13 +825,14 @@
 					$this->template->set_var('msg_folder', $_GET['msg_folder']);
 				}
-				else if($params['type']=="reply"){
+				else if($params['type']=="reply")
+				{
 					$this->template->set_var('from', $msg['toaddress2']);
 					$this->template->set_var('input_to', $msg['from']['email']);
-	
 					$this->template->set_var('subject', "Re:" . $msg['subject']);
-	
 					$this->template->set_var('msg_number', $_GET['msg_number']);
 					$this->template->set_var('msg_folder', $_GET['msg_folder']);
-				} else {
+				}
+				else 
+				{
 					$this->template->set_var('input_to', "");
 					$this->template->set_var('input_cc', "");
@@ -827,6 +841,6 @@
 			}
 			
-				if($params['type']=="reply" || $params['type']=="forward"  || $params['type']=="reply_all" )
-					$this->template->set_var("show_check_add_history","block");
+			if($params['type']=="reply" || $params['type']=="forward"  || $params['type']=="reply_all" )
+				$this->template->set_var("show_check_add_history","block");
 			
 			//tem que ser realizado no final, pois o tipo user_add é modificado para o tipo que o originou
@@ -920,7 +934,16 @@
 			if($isImportant) $mail->isImportant();
 			//add history
-			if($addHistory && $msgNumber) {
+			if($addHistory && $msgNumber)
+			{
 				$msg = $this->imap_functions->get_info_msg(array('msg_number' => $msgNumber ) );
-				$mail->Body .= "<br />".$msg['body']."<br />";
+				
+				$_name	= ( isset($msg['from']['name']) ) ? $msg['from']['name'] : "";
+				$_email	= ( isset($msg['from']['email']) ) ? " ".$msg['from']['email']." " : "";
+				
+				$history_msg  = "<br/><br/><br/>";
+				$history_msg .= lang('At %1, %2 hours, %3 wrote:', $msg['msg_day'], $msg['msg_hour'],"\"".$_name."\"".$_email );
+				$history_msg .= "<br/>";
+				
+				$mail->Body .= "<br/>". $history_msg . $msg['body']."<br/>";
 			}
 			//read confirmation
@@ -976,13 +999,29 @@
 				header("Location: index.php?menuaction=mobile.ui_mobilemail.index&error_message=".lang("please select one e-mail"));
 			} else {
-				$params_messages = array(
-					'msgs_number' => isset($params['msgs'])?implode(",",$params['msgs']):$params['msg_number'],
-					'folder' => $this->folders[$this->current_folder]['folder_name'],
-					'new_folder_name' => 'Trash',
-					'new_folder' => 'INBOX/Trash'
-				);
+				$msg = "";
+
+				if($params["msg_folder"] == "INBOX/Trash") {
+					$params_messages = array(
+						'msgs_number' => isset($params['msgs'])?implode(",",$params['msgs']):$params['msg_number'],
+						'folder' => 'INBOX/Trash'
+					);
 				
-				$this->imap_functions->move_messages($params_messages);
-				header("Location: index.php?menuaction=mobile.ui_mobilemail.index&success_message=".lang("The messages were moved to trash").'&ignore_trace_url=true');				
+					$this->imap_functions->delete_msgs($params_messages);
+				
+					$msg = lang("The messages were deleted");
+				} else {
+					$params_messages = array(
+						'msgs_number' => isset($params['msgs'])?implode(",",$params['msgs']):$params['msg_number'],
+						'folder' => $this->folders[$this->current_folder]['folder_name'],
+						'new_folder_name' => 'Trash',
+						'new_folder' => 'INBOX/Trash'
+					);
+
+					$this->imap_functions->move_messages($params_messages);
+				
+					$msg = lang("The messages were moved to trash");
+				}
+
+				header("Location: index.php?menuaction=mobile.ui_mobilemail.index&success_message=".$msg.'&ignore_trace_url=true');
 			}
 		}
Index: /sandbox/expressoMail1_2/MailArchiver/2.2/mobile/templates/default/new_msg.tpl
===================================================================
--- /sandbox/expressoMail1_2/MailArchiver/2.2/mobile/templates/default/new_msg.tpl	(revision 4046)
+++ /sandbox/expressoMail1_2/MailArchiver/2.2/mobile/templates/default/new_msg.tpl	(revision 5035)
@@ -61,5 +61,5 @@
 	<div id="corpo_mensagem" class="limpar_div" style="background:#EFF8FB; display:table; width:100%" >
 		<div id="text_area"><textarea id="body" wrap="virtual" name="body" cols="5" rows="5">{body_value}</textarea></div>
-		<div class="limpar_div">&nbsp;<input type="checkbox" name="check_important" {check_important} />{lang_mark_as_important}</div>
+		<div class="limpar_div" style="display:{visible_important} !important;">&nbsp;<input type="checkbox" name="check_important" {check_important} />{lang_mark_as_important}</div>
 		<div class="limpar_div">&nbsp;<input type="checkbox" name="check_read_confirmation" {check_read_confirmation} />{lang_read_confirmation}</div>
 		<div class="limpar_div" style="display:{show_check_add_history}">&nbsp;<input type="checkbox" name="check_add_history" {check_add_history} />{lang_add_history}</div>
Index: /sandbox/expressoMail1_2/MailArchiver/2.2/filemanager/js/drag_area.js
===================================================================
--- /sandbox/expressoMail1_2/MailArchiver/2.2/filemanager/js/drag_area.js	(revision 4972)
+++ /sandbox/expressoMail1_2/MailArchiver/2.2/filemanager/js/drag_area.js	(revision 5035)
@@ -21,5 +21,5 @@
 DragArea.prototype.dragObj = function(e)
 {
-        var _event  = is_ie ? window.event : e;
+	var _event  = is_ie ? window.event : e;
 	var _target = is_ie ? _event.srcElement : _event.target;
 
@@ -40,5 +40,6 @@
 		sign.style.position = 'absolute';
 	}
-	else{
+	else
+	{
 		this.operation = "";
 		var sign = document.getElementById('dragSign');
@@ -46,9 +47,20 @@
 			return;
 		sign.parentNode.removeChild(sign);
-		if(_target.tagName == 'SPAN'){
-			var filesUrl = toolbar.getCheckedFiles();
-			var path = _target.id.replace(/main$/g,'').substr(1);
-			if (filesUrl.length > 1 && path.length > 1)
-				move_to(path,filesUrl);
+		
+		try
+		{
+			if(_target.tagName == 'SPAN')
+			{
+				var filesUrl = toolbar.getCheckedFiles();
+				var path = _target.id.replace(/main$/g,'').substr(1);
+				
+				if (filesUrl.length > 1 && path.length > 1)
+					move_to(path,filesUrl);
+			}
+			
+		}
+		catch(e)
+		{
+			
 		}
 	}
Index: /sandbox/expressoMail1_2/MailArchiver/2.2/filemanager/js/draw_api.js
===================================================================
--- /sandbox/expressoMail1_2/MailArchiver/2.2/filemanager/js/draw_api.js	(revision 4972)
+++ /sandbox/expressoMail1_2/MailArchiver/2.2/filemanager/js/draw_api.js	(revision 5035)
@@ -407,8 +407,19 @@
 }
 folderList.prototype.updateQuota = function(quotaSize,usedSpace){
-	if (parseInt(quotaSize) != 0){
+	if ( parseInt(quotaSize) != 0 )
+	{
 		var contentQuota = document.getElementById('content_quota');
-		if (contentQuota != null)
-			contentQuota.innerHTML = '<table width="102" cellspacing="0" cellpadding="0" border="0" id="table_quota"><tbody><tr><td width="102" nowrap="true" height="15" background="./phpgwapi/templates/default/images/dsunused.gif"><table cellspacing="0" cellpadding="0" border="0" style="width: '+parseInt((usedSpace/quotaSize)*100)+'%;"><tbody><tr><td height="15" class="dsused"/></tr></tbody></table></td><td nowrap="true" align="center"><span class="boxHeaderText">'+parseInt(usedSpace/quotaSize*100)+'% ('+borkb(usedSpace)+'/'+borkb(quotaSize)+')</span></td></tr></tbody></table></td></tr></table>';
+		
+		if ( contentQuota != null )
+		{
+			contentQuota.innerHTML = '<table width="102" cellspacing="0" cellpadding="0" border="0" id="table_quota">' +
+									 '<tbody><tr>' +
+									 '<td width="102" nowrap="true" height="15" background="./phpgwapi/templates/default/images/dsunused.gif">' +
+									 '<table cellspacing="0" cellpadding="0" border="0" style="width: '+parseInt((usedSpace/quotaSize)*100)+'%;">' +
+									 '<tbody><tr><td height="15" class="dsused"/></tr></tbody></table>'+
+									 '</td><td nowrap="true" align="center"><span class="boxHeaderText">&nbsp;&nbsp;'+
+									 parseInt(usedSpace/quotaSize*100)+'% ('+borkb(usedSpace)+'/'+borkb(quotaSize)+')</span>'+
+									 '</td></tr></tbody></table></td></tr></table>';
+		}
 	}
 }
@@ -526,15 +537,22 @@
 
 }
-toolbar.prototype.getCheckedFiles = function () {
+
+toolbar.prototype.getCheckedFiles = function()
+{
 	filesUrl = "";
 	var one_checked = false;
-	files=document.getElementsByName('fileman');
+	var files = document.getElementsByName('fileman');
 	var j=0;
+	
 	for (i = 0; i <  files.length; i++)
-		if (files[i].checked){
+	{	
+		if (files[i].checked)
+		{
 			one_checked = true;
 			filesUrl += "&fileman["+j+"]="+base64_encode(files[i].value);
 			j++;
 		}
+	}
+	
 	if (!one_checked)
 	{
@@ -542,4 +560,5 @@
 		return;
 	}
+	
 	return filesUrl;
 }
@@ -776,16 +795,16 @@
 {
 	clearTimeout(menuTimeout);
-	switch(type){
-		case 'preview':
-			var url = './index.php?menuaction=filemanager.vfs_functions.summary&file='+base64_encode(name)+"&path="+base64_encode(currentPath);
-			var htmlData = '<img src=\"'+url+'\">';
-			menuTimeout = setTimeout("draw_window_card(\'"+htmlData+"\')",500);
-			break;
-		case 'user':
-			var url = './index.php?menuaction=filemanager.user.card&lid='+base64_encode(name);
-			menuTimeout = setTimeout("cExecute_('"+url+"',draw_window_card)",500);
-			break;
-		default:
-			break;
+	
+	if( type == "preview" )
+	{
+		var url = './index.php?menuaction=filemanager.vfs_functions.summary&file='+base64_encode(name)+"&path="+base64_encode(currentPath);
+		var htmlData = '<img src=\"'+url+'\">';
+		menuTimeout = setTimeout( "draw_window_card(\'"+htmlData+"\')", 300 );
+	}
+	
+	if( type == "user")
+	{
+		var url = './index.php?menuaction=filemanager.user.card&lid='+base64_encode(name);
+		menuTimeout = setTimeout("cExecute_('"+url+"',draw_window_card)", 300 );
 	}
 
@@ -912,8 +931,9 @@
 	}
 	menu.innerHTML = content;
-
 	menu.style.visibility = 'visible';
-	clearTimeout(menuTimeout);
-	menuTimeout = setTimeout("hide_card()",4000);
+	
+	if( menuTimeout )
+		clearTimeout(menuTimeout);
+	menuTimeout = setTimeout("hide_card()",1000);
 }
 function hide_card()
Index: /sandbox/expressoMail1_2/MailArchiver/2.2/filemanager/js/common_functions.js
===================================================================
--- /sandbox/expressoMail1_2/MailArchiver/2.2/filemanager/js/common_functions.js	(revision 3913)
+++ /sandbox/expressoMail1_2/MailArchiver/2.2/filemanager/js/common_functions.js	(revision 5035)
@@ -213,5 +213,5 @@
 	for ( var i = 0 ; i < navigator.plugins.length; i++ )
 	{
-		if ( navigator.plugins[i].name.match('Java') || navigator.plugins[i].name.match('libnpjp2') )
+		if ( navigator.plugins[i][0].type.match('java') )
 		{
 			_winBuild( "dwindownewUpload" , "remove" );
Index: /sandbox/expressoMail1_2/MailArchiver/2.2/expressoAdmin1_2/inc/class.ldap_functions.inc.php
===================================================================
--- /sandbox/expressoMail1_2/MailArchiver/2.2/expressoAdmin1_2/inc/class.ldap_functions.inc.php	(revision 4644)
+++ /sandbox/expressoMail1_2/MailArchiver/2.2/expressoAdmin1_2/inc/class.ldap_functions.inc.php	(revision 5035)
@@ -2049,5 +2049,12 @@
 			return $result;
 		}
-
+		
+		if( empty($params['desc']) && trim($params['desc']) == "" )
+		{
+			$result['status'] 	= false;
+			$result['msg']		= $this->functions->lang('Field description is empty') . '.';
+			return $result;
+		}
+		
 		$uid = 'institutional_account_' . $params['mail'];
 		$dn = "uid=$uid," . $params['context'];
Index: /sandbox/expressoMail1_2/MailArchiver/2.2/expressoAdmin1_2/js/jscode/groups.js
===================================================================
--- /sandbox/expressoMail1_2/MailArchiver/2.2/expressoAdmin1_2/js/jscode/groups.js	(revision 640)
+++ /sandbox/expressoMail1_2/MailArchiver/2.2/expressoAdmin1_2/js/jscode/groups.js	(revision 5035)
@@ -277,5 +277,5 @@
 				alert(data.msg);
 			else
-				alert(get_lang('Group success deleted') + '.');
+				alert(get_lang('Group successful deleted') + '.');
 			
 			location.href="./index.php?menuaction=expressoAdmin1_2.uigroups.list_groups";
Index: /sandbox/expressoMail1_2/MailArchiver/2.2/admin/inc/class.uiconfig.inc.php
===================================================================
--- /sandbox/expressoMail1_2/MailArchiver/2.2/admin/inc/class.uiconfig.inc.php	(revision 3018)
+++ /sandbox/expressoMail1_2/MailArchiver/2.2/admin/inc/class.uiconfig.inc.php	(revision 5035)
@@ -182,5 +182,4 @@
 			}
 			
-			
 			if($appname=="admin") {							
 				/*
@@ -195,4 +194,5 @@
 			}
 			$t->set_var('title',lang('Site Configuration'));
+			$t->set_var('lang_Value_exceeds_the_PHP_upload_limit_for_this_server', lang('Value exceeds the PHP upload limit for this server'));
 			$t->set_var('action_url',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname));
 			$t->set_var('th_bg',     $GLOBALS['phpgw_info']['theme']['th_bg']);
Index: /sandbox/expressoMail1_2/MailArchiver/2.2/jabberit_messenger/jmessenger/js/jscode/loadIM.js
===================================================================
--- /sandbox/expressoMail1_2/MailArchiver/2.2/jabberit_messenger/jmessenger/js/jscode/loadIM.js	(revision 4644)
+++ /sandbox/expressoMail1_2/MailArchiver/2.2/jabberit_messenger/jmessenger/js/jscode/loadIM.js	(revision 5035)
@@ -391,5 +391,5 @@
         function getBrowserCompatible()
         {
-            return SnifferBrowser.isCompatible('firefox3','firefox4','firefox5');
+            return SnifferBrowser.isCompatible('firefox3','firefox4','firefox5','firefox6');
         }
 	
@@ -856,5 +856,5 @@
                 }
 			
-                if( SnifferBrowser.isCompatible('chrome11','ie8','firefox3','firefox4','firefox5','epiphany2','iceweasel3','safari') )
+                if( SnifferBrowser.isCompatible('chrome11','ie8','firefox3','firefox4','firefox5','firefox6','epiphany2','iceweasel3','safari') )
                 {	
                     var _idUser	= Base64.decode(getUserCurrent().jid);
@@ -1599,5 +1599,5 @@
                         if( _preferencesIM[0] === 'openWindowJabberit:true' )
                         {
-                            if( SnifferBrowser.isCompatible('chrome11','ie8','firefox3','firefox4','firefox5','epiphany2','iceweasel3','safari') )
+                            if( SnifferBrowser.isCompatible('chrome11','ie8','firefox3','firefox4','firefox5','firefox6','epiphany2','iceweasel3','safari') )
                                 TrophyIM.load();
                         }
Index: /sandbox/expressoMail1_2/MailArchiver/2.2/jabberit_messenger/jmessenger/js/jscode/loadIM.mini.js
===================================================================
--- /sandbox/expressoMail1_2/MailArchiver/2.2/jabberit_messenger/jmessenger/js/jscode/loadIM.mini.js	(revision 4644)
+++ /sandbox/expressoMail1_2/MailArchiver/2.2/jabberit_messenger/jmessenger/js/jscode/loadIM.mini.js	(revision 5035)
@@ -84,5 +84,5 @@
 {return document.getElementById(elementId);}
 function getBrowserCompatible()
-{return SnifferBrowser.isCompatible('firefox3','firefox4','firefox5');}
+{return SnifferBrowser.isCompatible('firefox3','firefox4','firefox5','firefox6');}
 function getPhotoUser(jid)
 {try
@@ -180,5 +180,5 @@
 {var winRosterDiv={id_window:"window_Roster_im",width:250,height:410,top:50,left:-1500,leftOld:50,draggable:true,visible:"display",resizable:true,zindex:zIndex++,title:"Expresso Messenger - Contatos",closeAction:"hidden",content:""};if(_preferencesIM[0]=="openWindowJabberit:false")
 {winRosterDiv.left=50;winRosterDiv.leftOld=-1500;}
-if(SnifferBrowser.isCompatible('chrome11','ie8','firefox3','firefox4','firefox5','epiphany2','iceweasel3','safari'))
+if(SnifferBrowser.isCompatible('chrome11','ie8','firefox3','firefox4','firefox5','firefox6','epiphany2','iceweasel3','safari'))
 {var _idUser=Base64.decode(getUserCurrent().jid);var paramListContact={'idUser':_idUser,'full_name':((fullName.length<25)?fullName:(fullName.substring(0,25)+"...")),'path_jabberit':path_jabberit,'help_expresso':help_expresso,'zIndex_':zIndex++};winRosterDiv.content=Xtools.parse(Xtools.xml("contacts_list"),"contactsList.xsl",paramListContact)}
 else
@@ -322,5 +322,5 @@
 selectEditable=new SelectEditable();addIcon();setTimeout(function()
 {if(_preferencesIM[0]==='openWindowJabberit:true')
-{if(SnifferBrowser.isCompatible('chrome11','ie8','firefox3','firefox4','firefox5','epiphany2','iceweasel3','safari'))
+{if(SnifferBrowser.isCompatible('chrome11','ie8','firefox3','firefox4','firefox5','firefox6','epiphany2','iceweasel3','safari'))
 TrophyIM.load();}},1500);autoStatus();configEvents(document,'onmousemove',autoStatus);configEvents(document,'onkeypress',autoStatus);},2000);}}
 loadIM.prototype.adIcon=addIcon;loadIM.prototype.actionButton=actionButton;loadIM.prototype.addContact=addContact;loadIM.prototype.addNewUser=addNewUser;loadIM.prototype.clrAllContacts=clrAllContacts;loadIM.prototype.configEvents=configEvents;loadIM.prototype.createChatRooms=createChatRooms;loadIM.prototype.disabledNotificationNewUsers=disabledNotificationNewUsers;loadIM.prototype.enabledNotificationNewUsers=enabledNotificationNewUsers;loadIM.prototype.getListRooms=getListRooms;loadIM.prototype.getBrowserCompatible=getBrowserCompatible;loadIM.prototype.getPhotoUser=getPhotoUser;loadIM.prototype.getSmiles=getSmiles;loadIM.prototype.getStatusUserIM=getStatusUserIM;loadIM.prototype.getStatusMessage=getStatusMessage;loadIM.prototype.getShowContactsOffline=getShowContactsOffline;loadIM.prototype.getUserCurrent=getUserCurrent;loadIM.prototype.getZIndex=getZindex;loadIM.prototype.groupsHidden=groupsHidden;loadIM.prototype.groupsVisible=groupsVisible;loadIM.prototype.joinRoom=joinRoom;loadIM.prototype.keyPressSearch=keyPressSearch;loadIM.prototype.listRooms=listRooms;loadIM.prototype.loginPage=loginPage;loadIM.prototype.notification=notificationNewMessage;loadIM.prototype.parse=parse;loadIM.prototype.preferences=preferences;loadIM.prototype.searchUser=searchUser
Index: /sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/inc/class.ldap_functions.inc.php
===================================================================
--- /sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/inc/class.ldap_functions.inc.php	(revision 4972)
+++ /sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/inc/class.ldap_functions.inc.php	(revision 5035)
@@ -331,25 +331,25 @@
 
 		$phoneUser = $contacts_result['phone'];
-
-		if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['voip_enabled'] && $phoneUser) {
-			$phoneUser = '<a title="'.$this->functions->getLang("Call to Comercial Number").'" href="#" onclick="InfoContact.connectVoip(\''.$phoneUser.'\',\'com\')">'.$phoneUser.'</a>';
-			if($contacts_result['mobile']){
-				$phoneUser .= ' / <a title="'.$this->functions->getLang("Call to Mobile Number").'" href="#" onclick="InfoContact.connectVoip(\''.$contacts_result['mobile'].'\',\'mob\')">'.$contacts_result['mobile'].'</a>';
-			}
-		}
-		//verifica de existe o celular do funcionario ($contacts_result["mobile"]), se nao, $phoneUser fica vazia;
-
-		    $mobileUser = $contacts_result["mobile"];
-		    if($mobileUser && !$voipMobile) {
-			    $phoneUser .= " / $mobileUser";
-		    }
-		    $empNumber = $contacts_result["employeenumber"];
-		    if($empNumber) {
-			    $empNumber = "$empNumber - ";
-		    }
-		    $ou = $contacts_result["ou"];
-		    if($ou) {
-			    $ou = "<br/>$ou" ;
-		    }
+		$mobileUser = $contacts_result["mobile"];
+		if($mobileUser){
+			$phoneUser .= " / $mobileUser";
+		}
+		
+		if($_SESSION['phpgw_info']['user']['preferences']['expressoMail']['voip_enabled']) {
+			$phoneUser = $contacts_result['phone'];
+			if($phoneUser)
+				$phoneUser = '<a title="'.$this->functions->getLang("Call to Comercial Number").'" href="#" onclick="InfoContact.connectVoip(\''.$phoneUser.'\',\'com\')">'.$phoneUser.'</a>';
+			if($mobileUser)
+				$phoneUser .= ' / <a title="'.$this->functions->getLang("Call to Mobile Number").'" href="#" onclick="InfoContact.connectVoip(\''.$mobileUser.'\',\'mob\')">'.$mobileUser.'</a>';
+		}
+
+		$empNumber = $contacts_result["employeenumber"];
+	    if($empNumber) {
+		    $empNumber = "$empNumber - ";
+	    }
+	    $ou = $contacts_result["ou"];
+	    if($ou) {
+		    $ou = "<br/>$ou" ;
+	    }
 
 		// Begin: nickname, firstname and lastname for QuickAdd.
Index: /sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/js/InfoContact.js
===================================================================
--- /sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/js/InfoContact.js	(revision 3388)
+++ /sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/js/InfoContact.js	(revision 5035)
@@ -16,5 +16,5 @@
 	card.style.display = "none";
 	card.style.width = "244px";
-	card.style.backgroundImage = "url("+pic.src+")";
+	card.style.background = "url("+pic.src+") no-repeat";
 	card.style.height = "134px";
 	card.style.position = "absolute";
@@ -81,4 +81,8 @@
 		cn = cn.toString().substring(0,30) + "...";
 	
+	var email = data.email;
+	if(email && email.toString().length > 35)
+		email = email.toString().substring(0,30) + "...";
+
 		var phoneUser;
 
@@ -93,8 +97,10 @@
 
 
-	if(preferences.voip_enabled && phoneUser) {
-		phoneUser = "<a title=\""+get_lang("Call to Comercial Number")+"\" href=\"#\" onclick=\"InfoContact.connectVoip('"+phoneUser+"', 'com')\">"+phoneUser+"</a>";
+	if(preferences.voip_enabled) {
+		phoneUser = '';
+		if(data.telefone)
+			phoneUser = "<a title=\""+get_lang("Call to Comercial Number")+"\" href=\"#\" onclick=\"InfoContact.connectVoip('"+ data.telefone+"', 'com')\">"+ data.telefone+"</a>";
 		if(data.mobile){
-			phoneUser += " / <a title=\""+get_lang("Call to Mobile Number")+"\" href=\"#\" onclick=\"InfoContact.connectVoip('"+data.mobile+"', 'mob')\">"+data.mobile+"</a>";
+			phoneUser += "<br>&nbsp;<a title=\""+get_lang("Call to Mobile Number")+"\" href=\"#\" onclick=\"InfoContact.connectVoip('"+data.mobile+"', 'mob')\">"+data.mobile+"</a>";
 		}
 	}
@@ -104,12 +110,11 @@
 						"<td  style='padding-top:4px' align='center' valign='center' colspan ='2'><img src='templates/"+template+"/images/"+(data.type)+"_catalog.png' /><font size=1 color=BLACK>&nbsp;<b>"+get_lang("Sender's Information")+"</b></font>"+_this.verifyIM(data.uid,data.email)+"</td></tr>"+
 
-						"<tr><td align='center' width='70' height='93' style='padding-left:6px' align='center' valign='center'>"+
+						"<tr><td align='center' style='width:70px;height:93px;padding-left:6px' align='center' valign='center'>"+
 						"<img style='float:left' src='./inc/show_img.php?email="+data.email+"'></td>"+
-						"<td style='padding-left:2px' align='left' valign='top'>"+
+						"<td style='padding-left:2px' width='70%' align='left' valign='top'>"+
 						"<br><img style='float:left'align='center' src='templates/"+template+"/images/phone.gif' />&nbsp;<font  size=1  color=BLACK>"+(phoneUser ? phoneUser : get_lang("None") )+"</font><br />"+
-						"<font size=1 color=BLACK>"+employeeNumber+"<br/>"+cn+"</font>"+
+						"<br><font size=1 color=BLACK>"+cn+"</font><br><b>"+employeeNumber+"</b>"+
 						"<br/>"+ou+"</td></tr>"+
-
-						"<tr><td  style='padding-bottom:4px' align='center' valign='center' colspan ='2'><span title='"+get_lang("Write message")+"' style='cursor:pointer' onclick='InfoContact.sendMail(\""+cn+"\",\""+data.email+"\")'><font size=1 color=DARKBLUE><u>"+data.email+"</u></font></span>"+
+						"<tr><td  style='padding-bottom:4px' align='center' valign='center' colspan ='2' nowrap><span title='"+get_lang("Write message")+"' style='cursor:pointer' onclick='InfoContact.sendMail(\""+cn+"\",\""+data.email+"\")'><font size=1 color=DARKBLUE><u>"+email+"</u></font></span>"+
 										"</td></tr></table>";
 
Index: /sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/js/sharemailbox.js
===================================================================
--- /sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/js/sharemailbox.js	(revision 4644)
+++ /sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/js/sharemailbox.js	(revision 5035)
@@ -8,11 +8,11 @@
 	}
         
-        cShareMailbox.prototype.get_available_users = function(context)
-        {
-            if( sharedFolders_users_auto_search.toString() === "true" )
-            {    
-                this.get_available_users2(context);
-            }
+    cShareMailbox.prototype.get_available_users = function(context)
+    {
+        if( sharedFolders_users_auto_search.toString() === "true" )
+        {    
+            this.get_available_users2(context);
         }
+    }
 
 	cShareMailbox.prototype.get_available_users2 = function()
@@ -325,13 +325,14 @@
 	}
 	
-        cShareMailbox.prototype.optionFinderTimeout = function(Obj, Event )
-	{
-		var minNumChar  = sharedFolders_min_num_characters;
-                var oWait       = document.getElementById("em_span_searching");
-                this.context    = document.getElementById('em_combo_org').value;
-                
-                if( ( parseInt(minNumChar) > 0 && minNumChar.toString() != "" ) &&
-                        sharedFolders_users_auto_search.toString() === "false" )
-                {
+    cShareMailbox.prototype.optionFinderTimeout = function(Obj, Event )
+	{
+		var minNumChar  = trim(sharedFolders_min_num_characters);
+		minNumChar  = ( minNumChar === "" || parseInt(minNumChar) == 0 ) ? 1 : minNumChar;
+		
+		var oWait       = document.getElementById("em_span_searching");
+        this.context    = document.getElementById('em_combo_org').value;
+
+        if( parseInt(minNumChar) > 0  && sharedFolders_users_auto_search.toString() === "false" )
+        {
 			var key             = [8,27,37,38,39,40];
 			var ev              = Event;
@@ -354,10 +355,10 @@
 
 			for( var i in key )
-                        {
-                            if( ev.keyCode == key[i])
-                            {    
-                                return false;
-                            }
-                        }
+			{
+				if( ev.keyCode == key[i])
+                {    
+					return false;
+                }
+			}
 
 			if( _inputSearch.value.length < parseInt(minNumChar) )
@@ -368,5 +369,5 @@
 			else
 			{
-				oWait.innerHTML = " ( Buscando aguarde .... )";
+				oWait.innerHTML = get_lang('Searching')+"...";
 				
 				if( this.finderTimeout )
@@ -375,14 +376,14 @@
 				this.finderTimeout = setTimeout(function(){ getUsers( _inputSearch, oWait); }, 1000);
 			}	
-                }
-                else
-                {
-                    if( this.finderTimeout )
-                        clearTimeout(this.finderTimeout);
-
-                    oWait.innerHTML = get_lang('Searching')+"...";
-                    
-                    this.finderTimeout = setTimeout(function(){ sharemailbox.optionFinder(Obj.id); }, 1000);
-                }
+         }
+         else
+         {
+            if( this.finderTimeout )
+                clearTimeout(this.finderTimeout);
+
+            oWait.innerHTML = get_lang('Searching')+"...";
+            
+            this.finderTimeout = setTimeout(function(){ sharemailbox.optionFinder(Obj.id); }, 1000);
+         }
 	}
 	
Index: /sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/js/search.js
===================================================================
--- /sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/js/search.js	(revision 4972)
+++ /sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/js/search.js	(revision 5035)
@@ -5,4 +5,5 @@
 	{
 		this.searchW   		= [];
+		this.folders		= new Array();
 		this.condition		= "";
 		this.sort_type		= "";
@@ -346,7 +347,10 @@
 			}
 
-			if ( local_folders.length > 0 )
-				gears = expresso_local_messages.search( local_folders, expresso_local_messages.getFilter() );
-
+			if ( local_folders.length > 0 ){
+				if (this.folders.length >0)
+					gears = expresso_local_messages.search( this.folders, expresso_local_messages.getFilter() );
+				else
+					gears = expresso_local_messages.search( local_folders, expresso_local_messages.getFilter() );
+			}
 			data['data_gears']	= gears;
 			data['num_msgs']	= gears.length;
@@ -1075,7 +1079,7 @@
 
 			// Gears - local
-			if ( local_folders.length > 0 )
+			if ( local_folders.length > 0 ){
 				tmp = expresso_local_messages.search( local_folders, fields );
-
+			}
             if( data['num_msgs'] )
             {
@@ -1097,4 +1101,5 @@
             	if( (tmp.length > 0) && (!data['num_msgs']) )
             	{
+            		EsearchE.folders = local_folders; 
             		EsearchE.viewLocalMessage();
             	}
Index: /sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/js/messages_controller.js
===================================================================
--- /sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/js/messages_controller.js	(revision 4972)
+++ /sandbox/expressoMail1_2/MailArchiver/2.2/expressoMail1_2/js/messages_controller.js	(revision 5035)
@@ -80,5 +80,5 @@
 				msgs_number = get_selected_messages();
 		    }
-		}	
+		}
 		if (!this.is_local_folder(folder)) 
 			delete_msgs(folder, msgs_number, border_ID);
