From 429a1694b6fcbc30ee3289bb589a56383fd30da5 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 15 Jul 2017 17:56:39 +0200
Subject: [PATCH] Fix various errors in mail bounce dialog

---
 program/js/app.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/program/js/app.js b/program/js/app.js
index f93717af7..1281c1753 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -355,6 +355,7 @@ function rcube_webmail()
         else if (this.env.action == 'bounce') {
           this.init_messageform_inputs();
           this.enable_command('identities', true);
+          this.env.compose_commands = [];
         }
         else if (this.env.action == 'get') {
           this.enable_command('download', true);
@@ -4134,7 +4135,7 @@ function rcube_webmail()
         }
       };
 
-    this.hide_menu('forwardmenu');
+    this.hide_menu('forwardmenu', event);
 
     this.simple_dialog(dialog, this.gettext('bouncemsg'), submit_func, {
       button: 'bounce',
@@ -5012,9 +5013,12 @@ function rcube_webmail()
         input.val(input_val).change();
     });
 
-    this.editor.change_signature(id, show_sig);
+    if (this.editor)
+      this.editor.change_signature(id, show_sig);
+
     this.env.identity = id;
     this.triggerEvent('change_identity');
+
     return true;
   };