--- /usr/local/www/data/wordpress/wp-includes/class-pop3.php	Thu Jun  7 18:18:08 2007
+++ ./wp-includes/class-pop3.php	Fri Jun 15 01:40:49 2007
@@ -367,13 +367,19 @@
         while ( !ereg("^\.\r\n",$line))
         {
             $line = fgets($fp,$buffer);
-            if (preg_match("/^\s+/", $line) && $count > 0) {
+            if (preg_match("/^\s+\S+/", $line) && $count > 0) {
                 $MsgArray[$count-1] .= $line;
                 continue;
             }
-            if(empty($line))    { break; }
+            if ((ereg("^\.\r\n",$line)) || (empty($line)))    { break; }
+
+	    //Strip any extra leading periods and store the result
+	    if (ereg("^\.\.", $line)) {
+		    $MsgArray[$count] = substr($line, 1);
+	    } else {
+		    $MsgArray[$count]  = $line;
+	    }
 
-            $MsgArray[$count] = $line;
             $count++;
         }
         return $MsgArray;