2 files changed, 12 insertions, 2 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index d170a689b6..3657a89aa0 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -255,7 +255,12 @@ class messenger
 			}
 		}
 
-		$this->set_template_paths($template_lang . '_email', $template_paths);
+		$this->set_template_paths(array(
+			array(
+				'name' 		=> $template_lang . '_email',
+				'ext_path' 	=> 'language/' . $template_lang . '/email'
+			),
+		), $template_paths);
 
 		$this->template->set_filenames(array(
 			'body'		=> $template_file . '.txt',
diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php
index 5d456e6355..51284af233 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -584,7 +584,12 @@ class p_master
 
 				if (is_dir($module_style_dir))
 				{
-					$template->set_custom_style('adm', array($module_style_dir, $phpbb_admin_path . 'style'));
+					$template->set_custom_style(array(
+						array(
+							'name' 		=> 'adm',
+							'ext_path' 	=> 'adm/style/',
+						),
+					), array($module_style_dir, $phpbb_admin_path . 'style'));
 				}
 			}