Index: /branches/2.3/phpgwapi/inc/class.sessions.inc.php =================================================================== --- /branches/2.3/phpgwapi/inc/class.sessions.inc.php (revision 4867) +++ /branches/2.3/phpgwapi/inc/class.sessions.inc.php (revision 4945) @@ -575,4 +575,5 @@ $this->appsession('password','phpgwapi',base64_encode($this->passwd)); + $this->appsession('browser_agent','phpgwapi',$GLOBALS['browser']->BROWSER_AGENT); if($this->certificate) $this->appsession('certificate','phpgwapi',$this->certificate); if ($GLOBALS['phpgw']->acl->check('anonymous',1,'phpgwapi')) Index: /branches/2.3/expressoMail1_2/inc/class.imap_functions.inc.php =================================================================== --- /branches/2.3/expressoMail1_2/inc/class.imap_functions.inc.php (revision 4927) +++ /branches/2.3/expressoMail1_2/inc/class.imap_functions.inc.php (revision 4945) @@ -1349,7 +1349,10 @@ $body = $this-> replace_links($body); - //Remoção de tags para correção de erro no firefox - $body = mb_eregi_replace("","",$body); - $body = mb_eregi_replace("","",$body); + //Remoção de tags para correção de erro no firefox + if($_SESSION['phpgw_session']['phpgw_app_sessions']['phpgwapi']['browser_agent']['content'] != 'IE'){ + $body = mb_eregi_replace("","",$body); + $body = mb_eregi_replace("","",$body); + } + $body = mb_ereg_replace("(
]*)(text-indent:[^>;]*-[^>;]*;)([^>]*>)","\\1\\3",$body); $body = mb_ereg_replace("(
]*)(margin-right:[^>;]*-[^>;]*;)([^>]*>)","\\1\\3",$body); @@ -1358,5 +1361,5 @@ $body = mb_ereg_replace('', $body); - $body = str_replace("\x00", '', $body); + $body = str_replace("\x00", '', $body); return "".$body;