summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--program/js/editor.js2
-rw-r--r--program/steps/mail/compose.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/program/js/editor.js b/program/js/editor.js
index 3782de869..bc36e9a39 100644
--- a/program/js/editor.js
+++ b/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' && !rcmail.env.opened_extwin) {
+ if (elem && elem.type == 'select-one') {
rcmail.change_identity(elem);
// Focus previously focused element
if (fe && fe.id != rcmail.env.composebody) {
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 09b53e990..2c2f7557a 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -508,7 +508,7 @@ function rcmail_compose_header_from($attrib)
}
}
- $out = $select_from->show($MESSAGE->compose['from']);
+ $out = $select_from->show((int)$MESSAGE->compose['from']);
// add signatures to client
$OUTPUT->set_env('signatures', $a_signatures);