Fix session race conditions when composing new messages

2 files changed, 4 insertions, 3 deletions

diff --git a/program/include/rcube_json_output.php b/program/include/rcube_json_output.php
index ade9cc033..e0a29c1b1 100644
--- a/program/include/rcube_json_output.php
+++ b/program/include/rcube_json_output.php
@@ -219,6 +219,7 @@ class rcube_json_output
      */
     public function send()
     {
+      sleep(6);
         $this->remote_response();
         exit;
     }
diff --git a/program/include/rcube_session.php b/program/include/rcube_session.php
index c1d9b9c6c..27cf69464 100644
--- a/program/include/rcube_session.php
+++ b/program/include/rcube_session.php
@@ -321,9 +321,9 @@ class rcube_session
    */
   public function cleanup()
   {
-    // current compose information is stored in $_SESSION['compose'], move it to $_SESSION['compose_data']
-    if ($_SESSION['compose']) {
-      $_SESSION['compose_data'][$_SESSION['compose']['id']] = $_SESSION['compose'];
+    // current compose information is stored in $_SESSION['compose'], move it to $_SESSION['compose_data_<ID>']
+    if ($compose_id = $_SESSION['compose']['id']) {
+      $_SESSION['compose_data_'.$compose_id] = $_SESSION['compose'];
       $this->remove('compose');
     }
   }