From 9263f55a634cafc805307a138f3f2d54df1faa21 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 5 Aug 2013 09:14:44 +0200
Subject: Ignore Reply-To when replying to own message (#1489230)

---
 program/steps/mail/compose.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'program/steps/mail')

diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index af84619f2..c9d8c0b45 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -322,8 +322,8 @@ foreach ($parts as $header) {
       else if (!empty($MESSAGE->headers->from))
         $fvalue = $MESSAGE->headers->from;
 
-      // Reply to message sent by yourself (#1487074)
-      if (!empty($ident) && $fvalue == $ident['ident']) {
+      // Reply to message sent by yourself (#1487074, #1489230)
+      if (!empty($ident) && in_array($ident['ident'], array($fvalue, $MESSAGE->headers->from))) {
         $fvalue = $MESSAGE->headers->to;
       }
     }
-- 
cgit v1.2.3