diff --git a/program/include/main.inc b/program/include/main.inc
index 0ebbeaa5a..9248caa99 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -64,7 +64,8 @@ function rcmail_startup($task='mail')
   $DB->sqlite_initials = $INSTALL_PATH.'SQL/sqlite.initial.sql';
 
   // we can use the database for storing session data
-  if (is_object($DB) && $DB->db_provider!='sqlite')
+  // session queries do not work with MDB2
+  if ($CONFIG['db_backend']!='mdb2' && is_object($DB) && $DB->db_provider!='sqlite')
     include_once('include/session.inc');
 
 
diff --git a/program/include/rcube_mdb2.inc b/program/include/rcube_mdb2.inc
index f87a9c029..f6fde8dd5 100755
--- a/program/include/rcube_mdb2.inc
+++ b/program/include/rcube_mdb2.inc
@@ -153,10 +153,10 @@ class rcube_db
         $this->db_handle->row_offset = $offset;
 		$this->db_handle->row_limit = $numrows;
 
-        $result = $this->db_handle->query($query,$params);
-        //$q = $this->db_handle->prepare($query);
-        //$q->bindParamArray($params);
-        //$result = $q->execute();
+        //$result = $this->db_handle->query($query,$params);
+        $q = $this->db_handle->prepare($query);
+        $q->bindParamArray($params);
+        $result = $q->execute();
 
         if (PEAR::isError($result))
             raise_error(array('code' => 500,