Index: /trunk/roundcubemail/program/steps/mail/compose.inc
===================================================================
--- /trunk/roundcubemail/program/steps/mail/compose.inc	(revision 2064)
+++ /trunk/roundcubemail/program/steps/mail/compose.inc	(revision 2065)
@@ -427,6 +427,4 @@
   }
 
-  rcube_html_editor();
-
   $out = $form_start ? "$form_start\n" : '';
 
@@ -446,6 +444,12 @@
   $out .= $form_end ? "\n$form_end" : '';
 
+  // include HTML editor
+  rcube_html_editor();
+  
   // include GoogieSpell
   if (!empty($CONFIG['enable_spellcheck'])) {
+
+    $lang = strtolower(substr($_SESSION['language'], 0, 2));
+  
     $spellcheck_langs = (array)$RCMAIL->config->get('spellcheck_languages', array('da'=>'Dansk', 'de'=>'Deutsch', 'en' => 'English', 'es'=>'Español', 'fr'=>'Français', 'it'=>'Italiano', 'nl'=>'Nederlands', 'pl'=>'Polski', 'pt'=>'Português', 'fi'=>'Suomi', 'sv'=>'Svenska'));
     if (!$spellcheck_langs[$lang])
@@ -455,5 +459,5 @@
     foreach ($spellcheck_langs as $key => $name) {
       $editor_lang_set[] = ($key == $lang ? '+' : '') . JQ($name).'='.JQ($key);
-    }
+      }
     
     $OUTPUT->include_script('googiespell.js');