diff --git a/importexport/inc/class.importexport_helper_functions.inc.php b/importexport/inc/class.importexport_helper_functions.inc.php
index 8375ce90a1..9b8fef6cdd 100755
--- a/importexport/inc/class.importexport_helper_functions.inc.php
+++ b/importexport/inc/class.importexport_helper_functions.inc.php
@@ -124,7 +124,7 @@ class importexport_helper_functions {
 				$account_ids[] = $account_id;
 				continue;
 			}
-			
+
 			// Handle groups listed as Group, <name>
 			if ( $account_lid[0] == ' ' && $account_id = $GLOBALS['egw']->accounts->name2id( trim($account_lid))) {
 				$account_ids[] = $account_id;
@@ -378,12 +378,12 @@ class importexport_helper_functions {
 			while (false !== ($entry = $d->read())) {
 				// Blacklisted?
 				if(is_array(self::$blacklist_files[$appname]) && in_array($entry, self::$blacklist_files[$appname]))  continue;
-
-				list( ,$classname, ,$extension) = explode('.',$entry);
+				if (!preg_match('/^class\.([^.]+)\.inc\.php$/', $entry, $matches)) continue;
+				$classname = $matches[1];
 				$file = $appdir. '/'. $entry;
 
 				foreach ($types as $type) {
-					if( !is_file($file) || strpos($entry, $type) === false || $extension != 'php' ) continue;
+					if( !is_file($file) || strpos($entry, $type) === false) continue;
 					require_once($file);
 					$reflectionClass = new ReflectionClass($classname);
 					if($reflectionClass->IsInstantiable() &&