From 1a8593a3152f57af144d20cf510ad3eea7b88d95 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 29 May 2016 12:32:31 +0200
Subject: [PATCH] Update changelog

---
 CHANGELOG         | 1 +
 program/js/app.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index d2a5c5223..35d8bc574 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,7 @@ CHANGELOG Roundcube Webmail
 - Fix so subfolders of INBOX can be set as Archive (#5274)
 - Fix bug where multi-folder search could choose a wrong folder in "this and subfolders" scope (#5282)
 - Fix bug where multi-folder search didn't work for unsubscribed INBOX (#5259)
+- Fix bug where "no body" alert could be displayed when sending mailvelope email
 
 RELEASE 1.2.0
 -------------
diff --git a/program/js/app.js b/program/js/app.js
index 773bfab72..a970bee04 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -4306,6 +4306,7 @@ function rcube_webmail()
     }
 
     // check for empty body (only possible if not mailvelope encrypted)
+console.log(this.mailvelope_editor);
     if (!this.mailvelope_editor && !this.editor.get_content() && !confirm(this.get_label('nobodywarning'))) {
       this.editor.focus();
       return false;