diff --git a/CHANGELOG b/CHANGELOG
index d0a7e7505..d66fc8ef1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
 
+2008/06/16 (thomasb)
+----------
+- Fixed CRAM-MD5 authentication (#1484819)
+
 2008/06/16 (alec)
 ----------
 - Fixed sending emoticons
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 0ffb0d3fa..14316b8b8 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -60,9 +60,15 @@ class rcube_config
     // load host-specific configuration
     $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
     if (isset($this->prop['locale_string']) && empty($this->prop['language']))
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index 5bae3f790..53808bd2b 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -57,8 +57,8 @@ class rcube_template extends rcube_html_page
         //$this->framed = $framed;
         $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
         $javascript = 'var '.JS_OBJECT_NAME.' = new rcube_webmail();';
@@ -110,13 +110,13 @@ class rcube_template extends rcube_html_page
      */
     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;
     }
 
     /**
@@ -127,9 +127,9 @@ class rcube_template extends rcube_html_page
      */
     public function template_exists($name)
     {
-	$filename = $this->config['skin_path'] . '/templates/' . $name . '.html';
+        $filename = $this->config['skin_path'] . '/templates/' . $name . '.html';
 
-	return (is_file($filename) && is_readable($filename));
+        return (is_file($filename) && is_readable($filename));
     }
 
     /**