diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index 5349ad0dd..a5a3ca64e 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -530,23 +530,19 @@ function rc_strrpos($haystack, $needle, $offset=0)
  * @return mixed  Header value or null if not available
  */
 function rc_request_header($name)
-  {
+{
   if (function_exists('getallheaders'))
-    {
-    $hdrs = getallheaders();
-    $hdrs = array_change_key_case($hdrs, CASE_UPPER);
+  {
+    $hdrs = array_change_key_case(getallheaders(), CASE_UPPER);
     $key  = strtoupper($name);
-    }
+  }
   else
-    {
+  {
     $key  = 'HTTP_' . strtoupper(strtr($name, '-', '_'));
     $hdrs = array_change_key_case($_SERVER, CASE_UPPER);
-    }
-  if (isset($hdrs[$key]))
-    {
-    return $hdrs[$key];
-    }
-  return null;
+  }
+
+  return $hdrs[$key];
   }
 
 
diff --git a/skins/default/common.css b/skins/default/common.css
index ed1f46cc4..c7743e84a 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -380,7 +380,7 @@ html>body*#quicksearchbar[id$="quicksearchbar"]:not([class="none"]) #quicksearch
   font-size: 11px;
   opacity: 0.7;
   -moz-opacity: 0.7;
-	filter: progid:DXImageTransform.Microsoft.Alpha(opacity=70);
+  filter: progid:DXImageTransform.Microsoft.Alpha(opacity=70);
 }
 
 a.rcmContactAddress
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 3628e3d9c..f8b53e029 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -187,12 +187,6 @@
 
 #mailboxlist-header
 {
-/*
-  position: absolute;
-  top: 85px;
-  left: 20px;
-  width: 140px !important;
-*/
   display: block;
   height: 12px;
   padding: 3px 10px 4px 10px;