diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 15d26a260..8f4bc9f9b 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -85,7 +85,8 @@ rcube_add_label('nosubject', 'nosenderwarning', 'norecipientwarning', 'nosubject
 
 // add config parameter to client script
 $OUTPUT->set_env('draft_autosave', !empty($CONFIG['drafts_mbox']) ? $CONFIG['draft_autosave'] : 0);
-
+// set current mailbox in client environment
+$OUTPUT->set_env('mailbox', $IMAP->get_mailbox_name());
 
 // get reference message and set compose mode
 if ($msg_uid = $_SESSION['compose']['param']['_reply_uid'])