Fix bug where compose options could be added to wrong form

skins/elastic/ui.js

@@ -93,7 +93,7 @@ function rcube_elastic_ui()
      */
     function setup()
     {
-        var title,
+        var title, form,
             content_buttons = [],
             is_framed = rcmail.is_framed();
 
@@ -193,6 +193,9 @@ function rcube_elastic_ui()
         $('[data-recipient-input]').each(function() { recipient_input(this); });
         $('.image-upload').each(function() { image_upload_input(this); });
 
+        // Mail compose features
+        if (form = rcmail.gui_objects.messageform) {
+            form = $('form[name="' + form + '"]');
             // Show input elements with non-empty value
             // These event handlers need to be registered before rcmail 'init' event
             $('#_cc, #_bcc, #_replyto, #_followupto', $('.compose-headers')).each(function() {
@@ -208,7 +211,7 @@ function rcube_elastic_ui()
             $('#compose-options').find('textarea,input,select').each(function() {
                 var hidden = $('<input>')
                     .attr({type: 'hidden', name: $(this).attr('name')})
-                .appendTo(rcmail.gui_objects.messageform);
+                    .appendTo(form);
 
                 $(this).attr('tabindex', 2)
                     .on('change', function() {
@@ -216,6 +219,7 @@ function rcube_elastic_ui()
                     })
                     .change();
             });
+        }
 
         // Add HTML/Plain tabs (switch) on top of textarea with TinyMCE editor
         $('textarea[data-html-editor]').each(function() { html_editor_init(this); });