Don't add signature (again) when opening compose view in a new window

program/js/app.js

@@ -3044,6 +3044,7 @@ function rcube_webmail()
     // close compose step in opener
     if (window.opener && opener.rcmail && opener.rcmail.env.action == 'compose') {
       setTimeout(function(){ opener.history.back(); }, 100);
+      this.env.opened_extwin = true;
     }
 
     // configure parallel autocompletion
@@ -3064,7 +3065,7 @@ function rcube_webmail()
       this.set_caret_pos(input_message, this.env.top_posting ? 0 : $(input_message).val().length);
       // add signature according to selected identity
       // if we have HTML editor, signature is added in callback
-      if (input_from.prop('type') == 'select-one') {
+      if (input_from.prop('type') == 'select-one' && !this.env.opened_extwin) {
         this.change_identity(input_from[0]);
       }
     }

program/js/editor.js

@@ -80,7 +80,7 @@ function rcmail_editor_callback()
   if (rcmail.env.default_font)
     $(tinyMCE.get(rcmail.env.composebody).getBody()).css('font-family', rcmail.env.default_font);
 
-  if (elem && elem.type == 'select-one') {
+  if (elem && elem.type == 'select-one' && !rcmail.env.opened_extwin) {
     rcmail.change_identity(elem);
     // Focus previously focused element
     if (fe && fe.id != rcmail.env.composebody) {