Index: branches/feature-module-update/data/module/Mail.php
===================================================================
--- branches/feature-module-update/data/module/Mail.php	(revision 16522)
+++ branches/feature-module-update/data/module/Mail.php	(revision 16523)
@@ -51,5 +51,5 @@
         $driver = strtolower($driver);
         $include_dir = realpath(dirname( __FILE__));
-        include_once $include_dir ."/../Mail/" . $driver . ".php";
+        include_once $include_dir ."/Mail/" . $driver . ".php";
         $class = 'Mail_' . $driver;
         if (class_exists($class)) {
@@ -153,5 +153,5 @@
             if (strcasecmp($key, 'From') === 0) {
                 $include_dir = realpath(dirname( __FILE__));
-                include_once $include_dir ."/../Mail/RFC822.php";
+                include_once $include_dir ."/Mail/RFC822.php";
                 $parser = &new Mail_RFC822();
                 $addresses = $parser->parseAddressList($value, 'localhost', false);
@@ -210,5 +210,5 @@
     function parseRecipients($recipients)
     {
-        include_once dirname(__FILE__) . "/../Mail/RFC822.php";
+        include_once dirname(__FILE__) . "/Mail/RFC822.php";
 
         // if we're passed an array, assume addresses are valid and