Index: branches/unlabeled/unlabeled-1.58.2/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -r5730 -r5795
--- branches/unlabeled/unlabeled-1.58.2/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 5730)
+++ branches/unlabeled/unlabeled-1.58.2/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 5795)
@@ -449,6 +449,11 @@
 				preg_match('/\/(.*)\//U', $filename, $rets);
 				$config['ModuleFolder'] = $rets[1];
 				$config['BasePath'] = dirname(FULL_PATH.$filename);
+				if (isset($config['AdminTemplatePath'])) {
+					// append template base folder for admin templates path of this prefix
+					$module_templates = $rets[1] == 'kernel' ? '' : $rets[1].'/';
+					$config['AdminTemplatePath'] = $module_templates.$config['AdminTemplatePath'];
+				}
 				$this->configData[$prefix] = $config;
 				$this->prefixFiles[$prefix] = $filename;
 				return $prefix;