diff --git a/include/enotify.php b/include/enotify.php
index 6d8cef8794..5665f485f4 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -134,6 +134,7 @@ function notification($params)
 		$thread = Item::selectFirstThreadForUser($params['uid'] ,['ignored'], ['iid' => $parent_id]);
 		if (DBA::isResult($thread) && $thread["ignored"]) {
 			logger("Thread ".$parent_id." will be ignored", LOGGER_DEBUG);
+			L10n::popLang();
 			return;
 		}
 
@@ -628,6 +629,7 @@ function notification($params)
 			'$content_allowed'	=> $content_allowed,
 		]);
 
+		L10n::popLang();
 		// use the Emailer class to send the message
 		return Emailer::send(
 			[
@@ -643,6 +645,7 @@ function notification($params)
 		);
 	}
 
+	L10n::popLang();
 	return false;
 }
 
diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index f8fc1651c1..50566dc877 100644
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -77,10 +77,9 @@ class DBStructure
 				The friendica developers released update %s recently,
 				but when I tried to install it, something went terribly wrong.
 				This needs to be fixed soon and I can't do it alone. Please contact a
-				friendica developer if you can not help me on your own. My database might be invalid."));
-			$body = L10n::t("The error message is\n[pre]%s[/pre]");
-			$preamble = sprintf($preamble, $update_id);
-			$body = sprintf($body, $error_message);
+				friendica developer if you can not help me on your own. My database might be invalid.",
+				$update_id));
+			$body = L10n::t("The error message is\n[pre]%s[/pre]", $error_message);
 
 			notification([
 				'uid'      => $admin['uid'],
@@ -90,6 +89,7 @@ class DBStructure
 				'body'     => $body,
 				'language' => $lang]
 			);
+			L10n::popLang();
 		}
 
 		//try the logger