From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 20 Jan 2010 19:32:23 +0000 (-0700)
Subject: Only show reply-to address in imp message mode if it is different than from address
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=6735c1a2f71be923a6b03e28ef7cee4faaa91c56;p=horde.git

Only show reply-to address in imp message mode if it is different than from address
---

diff --git a/imp/message.php b/imp/message.php
index 5c6fc3c61..95327d0a8 100644
--- a/imp/message.php
+++ b/imp/message.php
@@ -302,10 +302,11 @@ case 'low':
     break;
 }
 
-/* Build Reply-To address links. */
-$reply_to = $imp_ui->buildAddressLinks($envelope['reply-to'], $self_link);
-if (!empty($reply_to) &&
-    (!($from = $display_headers['from']) || ($from != $reply_to))) {
+/* Build Reply-To address link. */
+if (!empty($envelope['reply-to']) &&
+    (Horde_Mime_Address::bareAddress(Horde_Mime_Address::addrObject2String(reset($envelope['from']))) !=
+     Horde_Mime_Address::bareAddress(Horde_Mime_Address::addrObject2String(reset($envelope['reply-to'])))) &&
+    ($reply_to = $imp_ui->buildAddressLinks($envelope['reply-to'], $self_link))) {
     $display_headers['reply-to'] = $reply_to;
 }