From 8ed0cc2314c38b2b67302a27db5509c03c86bd3b Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 20 Nov 2014 15:51:36 +0000
Subject: [PATCH] fix broken disposition-notification request

---
 mail/inc/class.mail_compose.inc.php | 3 ++-
 mail/templates/default/compose.xet  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index 11a4b4bb07..a9164e8f0f 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -2154,7 +2154,8 @@ class mail_compose
 			//error_log(__METHOD__.__LINE__.'$_mailObject->AddCustomHeader(List-Id: '. $_formData['list-id'].")");
 			$_mailObject->AddCustomHeader('List-Id: '. $_formData['list-id']);
 		}
-		if($_formData['disposition']) {
+		//error_log(__METHOD__.__LINE__.' notify to:'.$_identity['ident_email'].'->'.array2string($_formData));
+		if($_formData['disposition']=='on') {
 			$_mailObject->AddCustomHeader('Disposition-Notification-To: '. $_identity['ident_email']);
 		}
 		if(!empty($_identity->organization) && (mail_bo::$mailConfig['how2displayIdentities'] == '' || mail_bo::$mailConfig['how2displayIdentities'] == 'orgNemail')) {
diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet
index 298c29add1..a5197785e9 100644
--- a/mail/templates/default/compose.xet
+++ b/mail/templates/default/compose.xet
@@ -28,7 +28,7 @@
 				</description>
 				<description class="email-button-group notification">
 					<description value="Recieve notification"/>
-					<checkbox statustext="check to recieve a notification when the message is read (note: not all clients support this and/or the reciever may not authorize the notification)" id="disposition" options="$cont[disposition]"/>
+					<checkbox statustext="check to recieve a notification when the message is read (note: not all clients support this and/or the reciever may not authorize the notification)" id="disposition" options="on,off"/>
 				</description>
 				<description class="email-button-group priority">
 					<description value="Priority"/>