diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index af2c4fd78f..ef432e72b3 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -151,6 +151,7 @@
 		<li>[Fix] Database updater now separates ADD COLUMN from SET NOT NULL and SET DEFAULT, when using PostgreSQL &lt;= 7.4 (Bug #54435)</li>
 		<li>[Fix] Styles adjustment to correctly display an order of rtl/ltr mixed content. (Bugs #55485, #55545)</li>
 		<li>[Fix] Fix language string for PM-Reports refering to post-data. (Bug #54745)</li>
+		<li>[Fix] Do not store email templates in database. (Bug #54505)</li>
 		<li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li>
 		<li>[Change] Log activation through inactive users ACP. (Bug #30145)</li>
 		<li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li>
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 4b69b26eb6..99883cd9ca 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -182,16 +182,7 @@ class messenger
 			trigger_error('No template file for emailing set.', E_USER_ERROR);
 		}
 
-		if (!$template_path)
-		{
-			$path_check = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/';
-		}
-		else
-		{
-			$path_check = $template_path;
-		}
-
-		if (!trim($template_lang) || !file_exists("$path_check$template_lang/email/$template_file.txt"))
+		if (!trim($template_lang))
 		{
 			// fall back to board default language if the user's language is
 			// missing $template_file.  If this does not exist either,
@@ -205,13 +196,23 @@ class messenger
 			$this->tpl_msg[$template_lang . $template_file] = new template();
 			$tpl = &$this->tpl_msg[$template_lang . $template_file];
 
+			$fallback_template_path = false;
+
 			if (!$template_path)
 			{
 				$template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/';
 				$template_path .= $template_lang . '/email';
+
+				// we can only specify default language fallback when the path is not a custom one for which we
+				// do not know the default language alternative
+				if ($template_lang !== basename($config['default_lang']))
+				{
+					$fallback_template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/';
+					$fallback_template_path .= basename($config['default_lang']) . '/email';
+				}
 			}
 
-			$tpl->set_custom_template($template_path, $template_lang . '_email', 'email');
+			$tpl->set_custom_template($template_path, $template_lang . '_email', $fallback_template_path);
 
 			$tpl->set_filenames(array(
 				'body'		=> $template_file . '.txt',
diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php
index af5c9d3a47..f1c8094a9b 100644
--- a/phpBB/includes/template.php
+++ b/phpBB/includes/template.php
@@ -90,7 +90,7 @@ class template
 	* Set custom template location (able to use directory outside of phpBB)
 	* @access public
 	*/
-	function set_custom_template($template_path, $template_name, $template_mode = 'template')
+	function set_custom_template($template_path, $template_name, $fallback_template_path = false)
 	{
 		global $phpbb_root_path, $user;
 
@@ -103,12 +103,24 @@ class template
 		$this->root = $template_path;
 		$this->cachepath = $phpbb_root_path . 'cache/ctpl_' . str_replace('_', '-', $template_name) . '_';
 
-		// As the template-engine is used for more than the template (emails, etc.), we should not set $user->theme in all cases, but only on the real template.
-		if ($template_mode == 'template')
+		if ($fallback_template_path !== false)
 		{
-			$user->theme['template_storedb'] = false;
-			$user->theme['template_inherits_id'] = false;
+			if (substr($fallback_template_path, -1) == '/')
+			{
+				$fallback_template_path = substr($fallback_template_path, 0, -1);
+			}
+
+			$this->inherit_root = $fallback_template_path;
+			$this->orig_tpl_inherits_id = true;
 		}
+		else
+		{
+			$this->orig_tpl_inherits_id = false;
+		}
+
+		// the database does not store the path or name of a custom template
+		// so there is no way we can properly store custom templates there
+		$this->orig_tpl_storedb = false;
 
 		$this->_rootref = &$this->_tpldata['.'][0];
 
@@ -254,6 +266,12 @@ class template
 			trigger_error("template->_tpl_load(): No file specified for handle $handle", E_USER_ERROR);
 		}
 
+		// reload these settings to have the values they had when this object was initialised
+		// using set_template or set_custom_template, they might otherwise have been overwritten
+		// by other template class instances in between.
+		$user->theme['template_storedb'] = $this->orig_tpl_storedb;
+		$user->theme['template_inherits_id'] = $this->orig_tpl_inherits_id;
+
 		$filename = $this->cachepath . str_replace('/', '.', $this->filename[$handle]) . '.' . $phpEx;
 		$this->files_template[$handle] = (isset($user->theme['template_id'])) ? $user->theme['template_id'] : 0;
 
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 36a09e5ec4..c338df0b80 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1585,6 +1585,12 @@ function change_database_data(&$no_updates, $version)
 			set_config('feed_topics_new', (!empty($config['feed_overall_topics']) ? '1' : '0'));
 			set_config('feed_topics_active', (!empty($config['feed_overall_topics']) ? '1' : '0'));
 
+			// Delete all text-templates from the template_data
+			$sql = 'DELETE FROM ' . STYLES_TEMPLATE_DATA_TABLE . '
+				WHERE template_filename ' . $db->sql_like_expression($db->any_char . '.txt');
+			_sql($sql, $errored, $error_ary);
+
+			$no_updates = false;
 		break;
 	}
 }