diff -Naur program/include/main.inc ../webmail-dev1.alternative.ch/program/include/main.inc
--- program/include/main.inc	Fri Feb 24 16:09:57 2006
+++ ../webmail-dev1.alternative.ch/program/include/main.inc	Fri Feb 24 18:38:27 2006
@@ -669,7 +669,7 @@
     {
     $s_header_sent = TRUE;
     send_nocacheing_headers();
-    header('Content-Type: application/x-javascript');
+    header("Content-Type: application/x-javascript; charset=$CHARSET");
     print '/** remote response ['.date('d/M/Y h:i:s O')."] **/\n";
     }
 
diff -Naur ./program/include/rcube_shared.inc ../webmail-dev1.alternative.ch/program/include/rcube_shared.inc
--- ./program/include/rcube_shared.inc  Tue Feb 21 00:29:13 2006
+++ ../webmail-dev1.alternative.ch/program/include/rcube_shared.inc     Fri Feb 24 17:35:58 2006
@@ -116,9 +116,10 @@
     
     
     // include meta tag with charset
-    if (!empty($this->charset))
+    if (!empty($this->charset)) {
       $__page_header = '<meta http-equiv="content-type" content="text/html; charset='.$this->charset.'" />'."\n";;
-  
+      header("Content-Type: text/html; charset=$this->charset");
+    } 
   
     // definition of the code to be placed in the document header and footer
     if (is_array($this->script_files['head']))
diff -Naur program/js/app.js ../webmail-dev1.alternative.ch/program/js/app.js
--- program/js/app.js	Sun Feb 19 21:21:58 2006
+++ ../webmail-dev1.alternative.ch/program/js/app.js	Fri Feb 24 19:07:02 2006
@@ -2848,9 +2848,9 @@
   this.http_response = function(request_obj)
     {
     var ctype = request_obj.get_header('Content-Type');
-    if (ctype)
-      ctype = String(ctype).toLowerCase();
-
+    if (ctype) 
+      ctype = (String(ctype).toLowerCase()).split(';')[0];
+    
     if (request_obj.__lock)
       this.set_busy(false);
 
