diff --git a/classes/rawemailmessage.class.inc.php b/classes/rawemailmessage.class.inc.php
index f47545c..ac05541 100644
--- a/classes/rawemailmessage.class.inc.php
+++ b/classes/rawemailmessage.class.inc.php
@@ -498,7 +498,7 @@ protected function ExtractParts($aHeaders, $aBodyLines)
 		$aParsedParts = array();
 		$sContentType = isset($aHeaders['content-type']) ? $aHeaders['content-type'] : '';
 
-		if (($sContentType != '') && preg_match('/multipart(.*);.*?boundary="?([^"]+)"?/i', $sContentType, $aMatches))
+		if (($sContentType != '') && preg_match('/multipart(.*);.*?boundary="?([^";]+)"?/i', $sContentType, $aMatches))
 		{
 			$sBoundary = $aMatches[2];
 			if (empty($sBoundary))