From 58f5bba7da3193496929ed1709e695a9962c0ced Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 1 Oct 2010 00:38:30 -0600
Subject: [PATCH] Bug #9271: Fix auto-reply when replying to own messages

---
 imp/lib/Compose.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
index 524a006fe..1d21a4e23 100644
--- a/imp/lib/Compose.php
+++ b/imp/lib/Compose.php
@@ -1789,7 +1789,11 @@ class IMP_Compose
     protected function _getMatchingIdentity($h)
     {
         $msgAddresses = array();
-        foreach (array('to', 'cc', 'bcc') as $val) {
+
+        /* Bug #9271: Check 'from' address first; if replying to a message
+         * originally sent by user, this should be the identity used for the
+         * reply also. */
+        foreach (array('from', 'to', 'cc', 'bcc') as $val) {
             $msgAddresses[] = $h->getValue($val);
         }
 
-- 
2.11.0