2 files changed, 2 insertions, 1 deletions
diff --git a/program/include/rcube.php b/program/include/rcube.php
index 3b1601578..a39eab15c 100644
--- a/program/include/rcube.php
+++ b/program/include/rcube.php
@@ -409,6 +409,7 @@ class rcube
         ini_set('session.use_cookies', 1);
         ini_set('session.use_only_cookies', 1);
         ini_set('session.serialize_handler', 'php');
+        ini_set('session.cookie_httponly', 1);
 
         // use database for storing session data
         $this->session = new rcube_session($this->get_dbh(), $this->config);
diff --git a/program/include/rcube_utils.php b/program/include/rcube_utils.php
index 7f20dbb1a..dfd2026cc 100644
--- a/program/include/rcube_utils.php
+++ b/program/include/rcube_utils.php
@@ -47,7 +47,7 @@ class rcube_utils
         }
 
         $cookie = session_get_cookie_params();
-        $secure = self::https_check();
+        $secure = $cookie['secure'] || self::https_check();
 
         setcookie($name, $value, $exp, $cookie['path'], $cookie['domain'], $secure, true);
     }