Index: branches/dev/data/module/Mail/Mail.php
===================================================================
--- branches/dev/data/module/Mail/Mail.php	(revision 13188)
+++ branches/dev/data/module/Mail/Mail.php	(revision 13221)
@@ -152,5 +152,6 @@
         foreach ($headers as $key => $value) {
             if (strcasecmp($key, 'From') === 0) {
-                include_once '../Mail/RFC822.php';
+                $include_dir = realpath(dirname( __FILE__));
+                include_once $include_dir ."/../Mail/RFC822.php";
                 $parser = &new Mail_RFC822();
                 $addresses = $parser->parseAddressList($value, 'localhost', false);
