Added label tags to forms (Ticket #1483810)

git-svn-id: https://svn.roundcube.net/trunk@276 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 6 insertions, 1 deletions

diff --git a/roundcubemail/program/steps/mail/compose.inc b/roundcubemail/program/steps/mail/compose.inc
index 64b0d6364..7e6d306bd 100644
--- a/roundcubemail/program/steps/mail/compose.inc
+++ b/roundcubemail/program/steps/mail/compose.inc
@@ -690,6 +690,7 @@ function rcmail_compose_attachment_field($attrib)
   return $out;
   }
 
+
 function rcmail_priority_selector($attrib)
   {
   list($form_start, $form_end) = get_form_tags($attrib);
@@ -719,9 +720,13 @@ function rcmail_receipt_checkbox($attrib)
   {
   list($form_start, $form_end) = get_form_tags($attrib);
   unset($attrib['form']);
+  
+  if (!isset($attrib['id']))
+    $attrib['id'] = 'receipt';  
 
   $attrib['name'] = '_receipt';
-  $checkbox = new checkbox(array('name' => '_receipt', 'id' => 'receipt', 'value' => 1));
+  $attrib['value'] = '1';
+  $checkbox = new checkbox($attrib);
 
   $out = $form_start ? "$form_start\n" : '';
   $out .= $checkbox->show(0);