diff --git a/mod/lostpass.php b/mod/lostpass.php
index 5856148d7d..34daeffd7d 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -65,11 +65,11 @@ function lostpass_post(App $a)
 		Login Name:	%3$s', $resetlink, DI::baseUrl(), $user['nickname']));
 
 	$email = DI::emailer()
-	           ->newSystemMail((!empty($user['language'])) ? DI::l10n()->withLang($user['language']) : DI::l10n())
-	           ->withMessage(DI::l10n()->t('Password reset requested at %s', $sitename), $preamble, $body)
-	           ->forUser($user['uid'] ?? 0)
-	           ->withRecipient($user['email'])
-	           ->build();
+		->newSystemMail((!empty($user['language'])) ? DI::l10n()->withLang($user['language']) : DI::l10n())
+		->withMessage(DI::l10n()->t('Password reset requested at %s', $sitename), $preamble, $body)
+		->forUser($user['uid'] ?? 0)
+		->withRecipient($user['email'])
+		->build();
 
 	DI::emailer()->send($email);
 	DI::baseUrl()->redirect();
diff --git a/mod/removeme.php b/mod/removeme.php
index 86d1f04e34..d6b24eb0cc 100644
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -42,13 +42,14 @@ function removeme_post(App $a)
 		}
 
 		$email = DI::emailer()
-		           ->newSystemMail((!empty($admin['language'])) ? DI::l10n()->withLang($admin['language']) : DI::l10n()->withLang('en'))
-		           ->withMessage(DI::l10n()->t('[Friendica System Notify]') . ' ' . DI::l10n()->t('User deleted their account'),
-			           DI::l10n()->t('On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups.'),
-			           DI::l10n()->t('The user id is %d', local_user()))
-		           ->forUser($admin['uid'] ?? 0)
-		           ->withRecipient($admin['email'])
-		           ->build();
+			->newSystemMail((!empty($admin['language'])) ? DI::l10n()->withLang($admin['language']) : DI::l10n()->withLang('en'))
+			->withMessage(
+				DI::l10n()->t('[Friendica System Notify]') . ' ' . DI::l10n()->t('User deleted their account'),
+				DI::l10n()->t('On your Friendica node an user deleted their account. Please ensure that their data is removed from the backups.'),
+				DI::l10n()->t('The user id is %d', local_user()))
+			->forUser($admin['uid'] ?? 0)
+			->withRecipient($admin['email'])
+			->build();
 		DI::emailer()->send($email);
 	}
 
diff --git a/src/Core/Update.php b/src/Core/Update.php
index b1e0a7cf17..620519a236 100644
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -264,11 +264,11 @@ class Update
 			$body     = $l10n->t("The error message is\n[pre]%s[/pre]", $error_message);
 
 			$email = DI::emailer()
-			           ->newSystemMail($l10n)
-			           ->withMessage($l10n->t('[Friendica Notify] Database update'), $preamble, $body)
-			           ->forUser($admin['uid'] ?? 0)
-			           ->withRecipient($admin['email'])
-			           ->build();
+				->newSystemMail($l10n)
+				->withMessage($l10n->t('[Friendica Notify] Database update'), $preamble, $body)
+				->forUser($admin['uid'] ?? 0)
+				->withRecipient($admin['email'])
+				->build();
 			DI::emailer()->send($email);
 		}
 
@@ -300,11 +300,11 @@ class Update
 					$from_build, $to_build));
 
 				$email = DI::emailer()
-				           ->newSystemMail($l10n)
-				           ->withMessage($l10n->t('[Friendica Notify] Database update'), $preamble)
-				           ->forUser($admin['uid'] ?? 0)
-				           ->withRecipient($admin['email'])
-				           ->build();
+					->newSystemMail($l10n)
+					->withMessage($l10n->t('[Friendica Notify] Database update'), $preamble)
+					->forUser($admin['uid'] ?? 0)
+					->withRecipient($admin['email'])
+					->build();
 				DI::emailer()->send($email);
 			}
 		}
diff --git a/src/Model/User.php b/src/Model/User.php
index 1431dd0d82..6deb1c6aee 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -898,11 +898,11 @@ class User
 		));
 
 		$email = DI::emailer()
-		           ->newSystemMail(DI::l10n())
-		           ->withMessage(DI::l10n()->t('Registration at %s', $sitename), $body)
-		           ->forUser($user['uid'] ?? 0)
-		           ->withRecipient($user['email'])
-		           ->build();
+			->newSystemMail(DI::l10n())
+			->withMessage(DI::l10n()->t('Registration at %s', $sitename), $body)
+			->forUser($user['uid'] ?? 0)
+			->withRecipient($user['email'])
+			->build();
 		return DI::emailer()->send($email);
 	}
 
@@ -966,11 +966,11 @@ class User
 		));
 
 		$email = DI::emailer()
-		           ->newSystemMail($l10n)
-		           ->withMessage(DI::l10n()->t('Registration details for %s', $sitename), $preamble, $body)
-		           ->forUser($user['uid'] ?? 0)
-		           ->withRecipient($user['email'])
-		           ->build();
+			->newSystemMail($l10n)
+			->withMessage(DI::l10n()->t('Registration details for %s', $sitename), $preamble, $body)
+			->forUser($user['uid'] ?? 0)
+			->withRecipient($user['email'])
+			->build();
 		return DI::emailer()->send($email);
 	}
 
diff --git a/src/Module/Admin/Users.php b/src/Module/Admin/Users.php
index 5ca50d11ac..cbb2fa7ac6 100644
--- a/src/Module/Admin/Users.php
+++ b/src/Module/Admin/Users.php
@@ -77,11 +77,11 @@ class Users extends BaseAdmin
 			$body = sprintf($body, DI::baseUrl()->get(), $user['nickname'], $result['password'], DI::config()->get('config', 'sitename'));
 
 			$email = DI::emailer()
-			           ->newSystemMail((!empty($user['language'])) ? DI::l10n()->withLang($user['language']) : DI::l10n())
-			           ->withMessage(DI::l10n()->t('Registration details for %s', DI::config()->get('config', 'sitename')), $preamble, $body)
-			           ->forUser($user['uid'] ?? 0)
-			           ->withRecipient($user['email'])
-			           ->build();
+				->newSystemMail((!empty($user['language'])) ? DI::l10n()->withLang($user['language']) : DI::l10n())
+				->withMessage(DI::l10n()->t('Registration details for %s', DI::config()->get('config', 'sitename')), $preamble, $body)
+				->forUser($user['uid'] ?? 0)
+				->withRecipient($user['email'])
+				->build();
 			return DI::emailer()->send($email);
 		}