6 files changed, 28 insertions, 3 deletions
diff --git a/program/include/main.inc b/program/include/main.inc
index c0dd71ecb..67d596d87 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -189,12 +189,12 @@ function rcmail_set_imap_prop()
   global $CONFIG, $IMAP;
 
   // set root dir from config
-  if (strlen($CONFIG['imap_root']))
+  if (!empty($CONFIG['imap_root']))
     $IMAP->set_rootdir($CONFIG['imap_root']);
 
-  if (strlen($_SESSION['mbox']))
+  if (!empty($_SESSION['mbox']))
     $IMAP->set_mailbox($_SESSION['mbox']);
-    
+
   if (isset($_SESSION['page']))
     $IMAP->set_page($_SESSION['page']);
   }
@@ -1149,6 +1149,7 @@ function rcube_xml_command($command, $str_attrib, $a_attrib=NULL)
         'priorityselector' => 'rcmail_priority_selector',
         'charsetselector' => 'rcmail_charset_selector',
         'searchform' => 'rcmail_search_form',
+        'receiptcheckbox' => 'rcmail_receipt_checkbox',
         
         // ADDRESS BOOK
         'addresslist' => 'rcmail_contacts_list',
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index 027142098..72fc87862 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -123,6 +123,7 @@ $labels['compose']  = 'Neue Nachricht verfassen';
 $labels['sendmessage']  = 'Nachricht jetzt senden';
 $labels['addattachment']  = 'Datei anfügen';
 $labels['charset']  = 'Zeichensatz';
+$labels['returnreceipt'] = 'Empfangsbestätigung';
 
 $labels['attachments'] = 'Anhänge';
 $labels['upload'] = 'Hochladen';
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index 074ad3d86..249e6ec8f 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -124,6 +124,7 @@ $labels['compose']  = 'Neue Nachricht verfassen';
 $labels['sendmessage']  = 'Nachricht jetzt senden';
 $labels['addattachment']  = 'Datei anfügen';
 $labels['charset']  = 'Zeichensatz';
+$labels['returnreceipt'] = 'Empfangsbestätigung';
 
 $labels['attachments'] = 'Anhänge';
 $labels['upload'] = 'Hochladen';
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 9b27a90dc..e280dbb29 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -123,6 +123,7 @@ $labels['compose']  = 'Compose a message';
 $labels['sendmessage']  = 'Send the message now';
 $labels['addattachment']  = 'Attach a file';
 $labels['charset']  = 'Charset';
+$labels['returnreceipt'] = 'Return receipt';
 
 $labels['attachments'] = 'Attachments';
 $labels['upload'] = 'Upload';
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index d278279d9..b25c3690f 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -567,6 +567,22 @@ function rcmail_priority_selector($attrib)
   }
 
 
+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 --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 33f023de1..f8d3ada4f 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -136,6 +136,11 @@ if (!empty($_POST['_priority']))
     $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;