--- /tmp/roundcubemail/program/include/main.inc	2006-03-23 23:32:32.000000000 +0100
+++ /home/dok/Desktop/devel/roundcubemail/program/include/main.inc	2006-04-30 23:05:03.000000000 +0200
@@ -1098,8 +1099,11 @@
         'composeattachmentform' => 'rcmail_compose_attachment_form',
         'composeattachment' => 'rcmail_compose_attachment_field',
         'priorityselector' => 'rcmail_priority_selector',
         'charsetselector' => 'rcmail_charset_selector',
         'searchform' => 'rcmail_search_form',
+	'receiptcheckbox' => 'rcmail_receipt_checkbox',
         
         // ADDRESS BOOK
         'addresslist' => 'rcmail_contacts_list',
diff -ur /tmp/roundcubemail/program/steps/mail/compose.inc /home/dok/Desktop/devel/roundcubemail/program/steps/mail/compose.inc
--- /tmp/roundcubemail/program/steps/mail/compose.inc	2006-03-04 14:45:30.000000000 +0100
+++ /home/dok/Desktop/devel/roundcubemail/program/steps/mail/compose.inc	2006-04-30 23:07:02.000000000 +0200
@@ -555,6 +555,59 @@
   }
 
 
+function rcmail_receipt_checkbox($attrib)
+  {
+  list($form_start, $form_end) = get_form_tags($attrib);
+  unset($attrib['form']);
+
+  $attrib['name'] = '_receipt';
+  $checkbox = new checkbox(array('name' => '_receipt', 'id' => 'receipt', 'value' => 1));
+
+  $out = $form_start ? "$form_start\n" : '';
+  $out .= $checkbox->show(0);
+  $out .= $form_end ? "\n$form_end" : '';
+
+  return $out;
+  }
+
+
 function get_form_tags($attrib)
   {
   global $CONFIG, $OUTPUT, $JS_OBJECT_NAME, $MESSAGE_FORM, $SESS_HIDDEN_FIELD;  
diff -ur /tmp/roundcubemail/program/steps/mail/sendmail.inc /home/dok/Desktop/devel/roundcubemail/program/steps/mail/sendmail.inc
--- /tmp/roundcubemail/program/steps/mail/sendmail.inc	2006-03-23 23:32:43.000000000 +0100
+++ /home/dok/Desktop/devel/roundcubemail/program/steps/mail/sendmail.inc	2006-04-30 23:06:08.000000000 +0200
@@ -136,6 +136,11 @@
     $headers['X-Priority'] = sprintf("%d (%s)", $priority, ucfirst($str_priority));
   }
 
+if (!empty($_POST['_receipt'])) {
+  $headers['Return-Receipt-To'] = $identity_arr['string'];
+  $headers['Disposition-Notification-To'] = $identity_arr['string'];
+}
 
 // additional headers
 $headers['Message-ID'] = $message_id;
diff -ur /tmp/roundcubemail/skins/default/templates/compose.html /home/dok/Desktop/devel/roundcubemail/skins/default/templates/compose.html
--- /tmp/roundcubemail/skins/default/templates/compose.html	2006-03-20 23:01:13.000000000 +0100
+++ /home/dok/Desktop/devel/roundcubemail/skins/default/templates/compose.html	2006-04-30 23:03:56.000000000 +0200
@@ -37,6 +48,16 @@
 
 <div id="priority-selector">
 <roundcube:label name="priority" />:&nbsp;<roundcube:object name="prioritySelector" form="form" />
+<!--/div-->
+
+<roundcube:label name="receipt" />:&nbsp;<roundcube:object name="receiptCheckBox" form="form" />
+
+
 </div>
 
 </div>