Index: branches/dev/data/module/Mail/Mail.php
===================================================================
--- branches/dev/data/module/Mail/Mail.php	(revision 12893)
+++ branches/dev/data/module/Mail/Mail.php	(revision 12903)
@@ -19,5 +19,5 @@
 // $Id: Mail.php,v 1.17 2006/09/15 03:41:18 jon Exp $
 
-require_once 'PEAR.php';
+require_once dirname(__FILE__) . '/../PEAR.php';
 
 /**
@@ -151,5 +151,5 @@
         foreach ($headers as $key => $value) {
             if (strcasecmp($key, 'From') === 0) {
-                include_once 'Mail/RFC822.php';
+                include_once 'RFC822.php';
                 $parser = &new Mail_RFC822();
                 $addresses = $parser->parseAddressList($value, 'localhost', false);
@@ -208,5 +208,5 @@
     function parseRecipients($recipients)
     {
-        include_once 'Mail/RFC822.php';
+        include_once 'RFC822.php';
 
         // if we're passed an array, assume addresses are valid and