diff --git a/program/steps/settings/edit_folder.inc b/program/steps/settings/edit_folder.inc
index 172a953ff..fc55e870f 100644
--- a/program/steps/settings/edit_folder.inc
+++ b/program/steps/settings/edit_folder.inc
@@ -287,6 +287,7 @@ function rcmail_folder_form($attrib)
     $out .= "\n$form_end";
 
     $RCMAIL->output->set_env('messagecount', (int) $msgcount);
+    $RCMAIL->output->set_env('folder', $mbox);
 
     if ($mbox !== null && empty($_POST)) {
         $RCMAIL->output->command('parent.set_quota', $RCMAIL->quota_content(null, $mbox));
diff --git a/program/steps/settings/save_folder.inc b/program/steps/settings/save_folder.inc
index 9bb6bf3ab..b8fc49060 100644
--- a/program/steps/settings/save_folder.inc
+++ b/program/steps/settings/save_folder.inc
@@ -174,6 +174,7 @@ else if (!$error) {
         }
 
         $OUTPUT->show_message('folderupdated', 'confirmation');
+        $OUTPUT->set_env('folder', $folder['name']);
 
         if ($rename) {
             // #1488692: update session