Index: mailhandler.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mailhandler/Attic/mailhandler.module,v
retrieving revision 1.87.2.17
diff -u -p -r1.87.2.17 mailhandler.module
--- mailhandler.module	17 Sep 2008 16:29:36 -0000	1.87.2.17
+++ mailhandler.module	12 Dec 2008 21:49:10 -0000
@@ -429,7 +429,8 @@ function mailhandler_user_load($mail, $p
  * If available, use the mail header specified in mailbox config. otherwise use From: header
  */
 function mailhandler_get_fromaddress($header, $mailbox) {
-  if ($fromheader = strtolower($mailbox['fromheader']) && isset($header->$fromheader)) {
+  $fromheader = strtolower($mailbox['fromheader']);
+  if (isset($header->$fromheader)) {
     $from = $header->$fromheader;
   }
   else {