Merge branch 'trunk'

functions/mime.php

@@ -1401,8 +1401,8 @@ function sq_casenormalize(&$val){
 function sq_skipspace($body, $offset){
     $me = 'sq_skipspace';
     preg_match('/^(\s*)/s', substr($body, $offset), $matches);
-    if (strlen($matches{1}) > 0){
-        $count = strlen($matches{1});
+    if (!empty($matches[1])){
+        $count = strlen($matches[1]);
         $offset += $count;
     }
     return $offset;