diff --git a/program/js/app.js b/program/js/app.js
index 3e1a0d7a7..42a344f60 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3835,7 +3835,7 @@ function rcube_webmail()
           // all checks passed, send message
           var form = ref.gui_objects.messageform,
             hidden = $("[name='_pgpmime']", form),
-            msgid = ref.set_busy(true, draft || saveonly ? 'savingmessage' : 'sendingmessage')
+            msgid = ref.set_busy(true, draft || saveonly ? 'savingmessage' : 'sendingmessage');
 
           form.target = ref.get_save_target();
           form._draft.value = draft ? '1' : '';
@@ -4609,12 +4609,12 @@ function rcube_webmail()
     form.target = this.get_save_target();
     form._draft.value = draft ? '1' : '';
     form.action = this.add_url(form.action, '_unlock', msgid);
-    form.action = this.add_url(form.action, '_lang', lang);
     form.action = this.add_url(form.action, '_framed', 1);
 
-    if (saveonly) {
+    if (lang)
+        form.action = this.add_url(form.action, '_lang', lang);
+    if (saveonly)
       form.action = this.add_url(form.action, '_saveonly', 1);
-    }
 
     // register timer to notify about connection timeout
     this.submit_timer = setTimeout(function(){
diff --git a/program/js/editor.js b/program/js/editor.js
index 54645d277..b7ec13f26 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -394,7 +394,7 @@ function rcube_text_editor(config, id)
     }
   };
 
-  // get selected (spellcheker) language
+  // get selected (spellchecker) language
   this.get_language = function()
   {
     if (this.editor) {