--- mailhandler.retrieve.inc.orig	2008-11-15 13:44:17.000000000 +0200
+++ mailhandler.retrieve.inc	2008-11-15 13:54:56.000000000 +0200
@@ -529,7 +529,8 @@
  * 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 {