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

2 files changed, 6 insertions, 2 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 170e199d4..e80471100 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix wrong compose screen elements focus in IE9 (#1488541)
 - Fix fatal error when date.timezone isn't set (#1488546)
 - Update to TinyMCE 3.5.4.1
 - Better icons with distinct shapes for priority columns (#1488377)
diff --git a/program/js/editor.js b/program/js/editor.js
index a442282e7..963b1ce19 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -86,8 +86,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);
     }
   }