1 files changed, 9 insertions, 2 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 9682ada3a..20c561a5f 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1889,13 +1889,20 @@ function rcube_webmail()
       }
 
     // check for empty body
-    if ((((!window.tinyMCE || !tinyMCE.get('compose-body')) && input_message.value == '')
-	|| (window.tinyMCE && tinyMCE.get('compose-body') && tinyMCE.get('compose-body').getContent() == ''))
+    if ((!window.tinyMCE || !tinyMCE.get('compose-body'))
+	&& input_message.value == ''
 	&& !confirm(this.get_label('nobodywarning')))
       {
       input_message.focus();
       return false;
       }
+    else if (window.tinyMCE && tinyMCE.get('compose-body')
+	&& !tinyMCE.get('compose-body').getContent()
+	&& !confirm(this.get_label('nobodywarning')))
+      {
+      tinyMCE.get('compose-body').focus();
+      return false;
+      }
 
     return true;
     };