diff --git a/core/src/plugins/log.sql/class.sqlLogDriver.php b/core/src/plugins/log.sql/class.sqlLogDriver.php
index 8c1dc98939..567ac7d3de 100644
--- a/core/src/plugins/log.sql/class.sqlLogDriver.php
+++ b/core/src/plugins/log.sql/class.sqlLogDriver.php
@@ -98,7 +98,7 @@ public function formatMessage($message, $severity)
             }
         }
 
-        $message_parts = explode("\t", $message);
+        $message_parts = explode("\t", $message, 2);
         $severity = strtoupper((string) $severity);
 
         $log_row = Array(
diff --git a/core/src/plugins/log.text/class.textLogDriver.php b/core/src/plugins/log.text/class.textLogDriver.php
index b9b555c02d..e1a10b774b 100644
--- a/core/src/plugins/log.text/class.textLogDriver.php
+++ b/core/src/plugins/log.text/class.textLogDriver.php
@@ -287,9 +287,9 @@ public function xmlLogs($parentDir, $date, $nodeName = "log", $rootPath = "/logs
         $lines = file($fName);
         foreach ($lines as $line) {
             $line = AJXP_Utils::xmlEntities($line);
-            $matches = array();
-            if (preg_match("/(.*)\t(.*)\t(.*)\t(.*)\t(.*)\t(.*)$/", $line, $matches)!==false) {
-                $fileName = $parentDir."/".$matches[1];
+            $matches = explode("\t",$line,6);
+            if (count($matches) == 6) {
+                $fileName = $parentDir."/".$matches[0];
                 foreach ($matches as $key => $match) {
                     $match = AJXP_Utils::xmlEntities($match);
                     $match = str_replace("\"", "'", $match);
@@ -297,10 +297,10 @@ public function xmlLogs($parentDir, $date, $nodeName = "log", $rootPath = "/logs
                 }
                 if(count($matches) < 3) continue;
                 // rebuild timestamp
-                $date = $matches[1];
+                $date = $matches[0];
                 list($m,$d,$Y,$h,$i,$s) = sscanf($date, "%i-%i-%i %i:%i:%i");
                 $tStamp = mktime($h,$i,$s,$m,$d,$Y);
-                print(SystemTextEncoding::toUTF8("<$nodeName is_file=\"1\" ajxp_modiftime=\"$tStamp\" filename=\"$fileName\" ajxp_mime=\"log\" date=\"$matches[1]\" ip=\"$matches[2]\" level=\"$matches[3]\" user=\"$matches[4]\" action=\"$matches[5]\" params=\"$matches[6]\" icon=\"toggle_log.png\" />", false));
+                print(SystemTextEncoding::toUTF8("<$nodeName is_file=\"1\" ajxp_modiftime=\"$tStamp\" filename=\"$fileName\" ajxp_mime=\"log\" date=\"$matches[0]\" ip=\"$matches[1]\" level=\"$matches[2]\" user=\"$matches[3]\" action=\"$matches[4]\" params=\"$matches[5]\" icon=\"toggle_log.png\" />", false));
             }
         }
         return ;