Index: /trunk/roundcubemail/.htaccess
===================================================================
--- /trunk/roundcubemail/.htaccess	(revision 2585)
+++ /trunk/roundcubemail/.htaccess	(revision 2586)
@@ -11,5 +11,5 @@
 php_value	memory_limit		64M
 
-php_value	zlib.output_compression		0
+php_value	zlib.output_compression		1
 php_value	magic_quotes_gpc		0
 php_value	zend.ze1_compatibility_mode	0
Index: /trunk/roundcubemail/index.php
===================================================================
--- /trunk/roundcubemail/index.php	(revision 2585)
+++ /trunk/roundcubemail/index.php	(revision 2586)
@@ -40,16 +40,6 @@
 $RCMAIL->plugins->init();
 
-// set output buffering
-if ($RCMAIL->action != 'get' && $RCMAIL->action != 'viewsource') {
-  // use gzip compression if supported
-  if (function_exists('ob_gzhandler')
-      && !ini_get('zlib.output_compression')
-      && ini_get('output_handler') != 'ob_gzhandler') {
-    ob_start('ob_gzhandler');
-  }
-  else {
-    ob_start();
-  }
-}
+// turn on output buffering
+ob_start();
 
 // check if config files had errors
Index: /trunk/roundcubemail/program/steps/mail/get.inc
===================================================================
--- /trunk/roundcubemail/program/steps/mail/get.inc	(revision 2585)
+++ /trunk/roundcubemail/program/steps/mail/get.inc	(revision 2586)
@@ -34,4 +34,5 @@
 }
 
+ob_end_clean();
 
 // similar code as in program/steps/mail/show.inc
Index: /trunk/roundcubemail/program/steps/mail/viewsource.inc
===================================================================
--- /trunk/roundcubemail/program/steps/mail/viewsource.inc	(revision 2585)
+++ /trunk/roundcubemail/program/steps/mail/viewsource.inc	(revision 2586)
@@ -20,4 +20,5 @@
 */
 
+ob_end_clean();
 
 // similar code as in program/steps/mail/get.inc
