diff --git a/include/class.mailparse.php b/include/class.mailparse.php
index d498a77f7fd99bfe737fc1a9bddef58b505baa53..8cc91d0de95c98e019e43a24fac2e89e7c164acc 100644
--- a/include/class.mailparse.php
+++ b/include/class.mailparse.php
@@ -140,8 +140,8 @@ class Mail_Parse {
     /* static */ function splitHeaders($headers_text, $as_array=false) {
         $headers = preg_split("/\r?\n/", $headers_text);
         for ($i=0, $k=count($headers); $i<$k; $i++) {
-            # XXX: Might tabs be used here?
-            if (substr($headers[$i], 0, 1) == " ") {
+            // first char might be whitespace (" " or "\t")
+            if (in_array($headers[$i][0], array(" ", "\t"))) {
                 # Continuation from previous header (runon to next line)
                 $j=$i-1; while (!isset($headers[$j]) && $j>0) $j--;
                 $headers[$j] .= " ".ltrim($headers[$i]);