Fix wrong compose screen elements focus in IE9 (#1488541)

Conflicts:

	CHANGELOG

2 files changed, 6 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 89d89b7e4..5fec20cac 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix wrong compose screen elements focus in IE9 (#1488541)
 - Fix redirect to mail/compose on re-login (#1488226)
 - Add IE8 hack for messages list issue (#1487821)
 - Fix handling errors on draft auto-save
diff --git a/program/js/editor.js b/program/js/editor.js
index 63186fb02..f341ccb80 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -70,8 +70,11 @@ function rcmail_editor_callback()
     rcmail.change_identity(elem);
     // Focus previously focused element
     if (fe && fe.id != rcmail.env.composebody) {
-      window.focus(); // for WebKit (#1486674)
-      fe.focus();
+      // use setTimeout() for IE9 (#1488541)
+      window.setTimeout(function() {
+        window.focus(); // for WebKit (#1486674)
+        fe.focus();
+      }, 10);
     }
   }