Index: .htaccess
===================================================================
--- .htaccess	(revision 15111)
+++ .htaccess	(working copy)
@@ -9,11 +9,14 @@
 
 <IfModule mod_expires.c>
 	ExpiresActive on
-	ExpiresByType text/css "access plus 4 hours"
-	ExpiresByType application/x-javascript "access plus 4 hours"
-	ExpiresByType image/gif "access plus 4 hours"
-	ExpiresByType image/jpeg "access plus 4 hours"
-	ExpiresByType image/png "access plus 4 hours"
+	ExpiresByType text/css "access plus 1 month"
+	ExpiresByType application/x-javascript "access plus 1 month"
+	ExpiresByType application/javascript "access plus 1 month"
+	ExpiresByType image/gif "access plus 1 month"
+	ExpiresByType image/jpeg "access plus 1 month"
+	ExpiresByType image/png "access plus 1 month"
+	ExpiresByType image/x-icon "access plus 1 month"
+	ExpiresByType image/icon "access plus 1 month"
 </IfModule>
 
 ## Enable mod-rewrite
Index: core/kernel/application.php
===================================================================
--- core/kernel/application.php	(revision 15111)
+++ core/kernel/application.php	(working copy)
@@ -1171,6 +1171,12 @@
 			$this->HTML = ob_get_clean() . $this->HTML;
 		}
 
+		$language =& $this->recallObject('lang.current');
+		/* @var $language LanguagesItem */
+
+		// don't replace header if some tag (e.g. XMLTemplate) already set it to something else
+		header('Content-type: text/html; charset=' . $language->GetDBField('Charset'), false);
+
 		if ( $this->UseOutputCompression() ) {
 			$compression_level = $this->ConfigValue('OutputCompressionLevel');