Fix bug where cancelling switch from HTML to plain text didn't set editor type selector properly (#1490141)

2 files changed, 3 insertions, 0 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 1e3022a2f..21fea501a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -61,6 +61,7 @@ RELEASE 1.0.2
 - Fix bug where contacts with no email address were listed on compose addressbook (#1489970)
 - Fix images import from various vCard formats (#1489977)
 - Fix sorting messages by size on servers without SORT capability (#1489981)
+- Fix bug where cancelling switch from HTML to plain text didn't set editor type selector properly (#1490141)
 
 RELEASE 1.0.1
 -------------
diff --git a/program/js/app.js b/program/js/app.js
index 6e0d6902f..fe9daddc8 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3439,6 +3439,8 @@ function rcube_webmail()
     }
     else if (this.html2plain(tinyMCE.get(props.id).getContent(), props.id))
       tinyMCE.execCommand('mceRemoveControl', false, props.id);
+    else
+      return false;
 
     return true;
   };