Index: CHANGELOG
===================================================================
--- CHANGELOG	(revision 1bc48e3ee8d7bc73ed384803309f04c0068eafcc)
+++ CHANGELOG	(revision 4230651565e386662a6931396c3d4a6b33b4f30d)
@@ -1,4 +1,8 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2008/06/16 (thomasb)
+----------
+- Fixed CRAM-MD5 authentication (#1484819)
 
 2008/06/16 (alec)
Index: program/include/rcube_config.php
===================================================================
--- program/include/rcube_config.php	(revision 67effe9904d62880ab5bdaaf58b97af7113ed97f)
+++ program/include/rcube_config.php	(revision 4230651565e386662a6931396c3d4a6b33b4f30d)
@@ -61,7 +61,13 @@
     $this->load_host_config();
 
+    // set skin (with fallback to old 'skin_path' property)
+    if (empty($this->prop['skin']) && !empty($this->prop['skin_path']))
+      $this->prop['skin'] = str_replace('skins/', '', unslashify($this->prop['skin_path']));
+    else if (empty($this->prop['skin']))
+      $this->prop['skin'] = 'default';
+
     // fix paths
-    $this->prop['skin'] = $this->prop['skin'] ? unslashify($this->prop['skin']) : 'default';
     $this->prop['log_dir'] = $this->prop['log_dir'] ? unslashify($this->prop['log_dir']) : INSTALL_PATH . 'logs';
+    $this->prop['temp_dir'] = $this->prop['temp_dir'] ? unslashify($this->prop['temp_dir']) : INSTALL_PATH . 'temp';
     
     // handle aliases
Index: program/include/rcube_template.php
===================================================================
--- program/include/rcube_template.php	(revision 23bea9d4e95c5381fcc8f05739dc60c9eb273049)
+++ program/include/rcube_template.php	(revision 4230651565e386662a6931396c3d4a6b33b4f30d)
@@ -58,6 +58,6 @@
         $this->set_env('task', $task);
 
-	// load the correct skin (in case user-defined)
-	$this->set_skin($this->config['skin']);
+        // load the correct skin (in case user-defined)
+        $this->set_skin($this->config['skin']);
 
         // add common javascripts
@@ -111,11 +111,11 @@
     public function set_skin($skin)
     {
-	if (!empty($skin) && is_dir('skins/'.$skin) && is_readable('skins/'.$skin))
-	    $skin_path = 'skins/'.$skin;
-	else
-	    $skin_path = $this->config['skin_path'] ? $this->config['skin_path'] : 'skins/default';
-	
-	$this->app->config->set('skin_path', $skin_path);
-	$this->config['skin_path'] = $skin_path;
+        if (!empty($skin) && is_dir('skins/'.$skin) && is_readable('skins/'.$skin))
+            $skin_path = 'skins/'.$skin;
+        else
+            $skin_path = $this->config['skin_path'] ? $this->config['skin_path'] : 'skins/default';
+
+        $this->app->config->set('skin_path', $skin_path);
+        $this->config['skin_path'] = $skin_path;
     }
 
@@ -128,7 +128,7 @@
     public function template_exists($name)
     {
-	$filename = $this->config['skin_path'] . '/templates/' . $name . '.html';
-
-	return (is_file($filename) && is_readable($filename));
+        $filename = $this->config['skin_path'] . '/templates/' . $name . '.html';
+
+        return (is_file($filename) && is_readable($filename));
     }