Elastic: Fix bug where Enigma options in mail compose could sometimes be ignored (#6515)

CHANGELOG

@@ -90,6 +90,7 @@ RELEASE 1.4-rc1
 - Elastic: Add "status bar" for mobile in mail composer
 - Elastic: Add selection options on contacts list (#6595)
 - Elastic: Fix unintentional layout preference overwrite (#6613)
+- Elastic: Fix bug where Enigma options in mail compose could sometimes be ignored (#6515)
 - Log errors caused by low pcre.backtrack_limit when sending a mail message (#6433)
 - Fix regression where drafts were not deleted after sending the message (#6756)
 - Fix so max_message_size limit is checked also when forwarding messages as attachments (#6580)

plugins/enigma/enigma.js

@@ -80,13 +80,17 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
                 var opt = this, input = $('#enigma' + opt + 'opt');
 
                 if (rcmail.env['enigma_force_' + opt]) {
-                    input.prop('checked', true);
+                    input.prop('checked', true)
                 }
 
                 // Compose status bar in Elastic
                 if (window.UI && UI.compose_status) {
-                    input.on('change', function() { UI.compose_status(opt, this.checked); }).trigger('change');
+                    input.on('change', function() { UI.compose_status(opt, this.checked); });
                 }
+
+                // As the options might have been initially enabled we have to
+                // trigger onchange event, so all handlers can update the state
+                input.trigger('change');
             });
         }