diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index 7bee5923..2190a9d1 100644
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -82,15 +82,7 @@ function notifyall_post(App $a)
 	}
 
 	foreach ($recips as $recip) {
-		DI::emailer()->send([
-			'fromName'             => $sender_name,
-			'fromEmail'            => $sender_email,
-			'replyTo'              => $sender_email,
-			'toEmail'              => $recip['email'],
-			'messageSubject'       => $subject,
-			'htmlVersion'          => $htmlversion,
-			'textVersion'          => $textversion
-		]);
+		DI::emailer()->send($sender_name, $sender_email, $sender_email, $recip['email'], $subject, $htmlversion, $textversion);
 	}
 
 	notice(DI::l10n()->t('Emails sent'));
diff --git a/securemail/securemail.php b/securemail/securemail.php
index 8b8a3fd8..1f7cd768 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -103,20 +103,12 @@ function securemail_settings_post(App &$a, array &$b)
 			$subject = 'Friendica - Secure Mail - Test';
 			$message = 'This is a test message from your Friendica Secure Mail addon.';
 
-			$params = [
-				'uid' => local_user(),
-				'fromName' => $sitename,
-				'fromEmail' => $sender_email,
-				'toEmail' => $a->user['email'],
-				'messageSubject' => $subject,
-				'htmlVersion' => "<p>{$message}</p>",
-				'textVersion' => $message,
-			];
-
 			// enable addon for test
 			DI::pConfig()->set(local_user(), 'securemail', 'enable', 1);
 
-			$res = DI::emailer()->send($params);
+			$res = DI::emailer()->send($sitename, $sender_email, $sender_email,
+				$a->user['email'], $subject, "<p>{$message}</p>", $message,
+				'', local_user());
 
 			// revert to saved value
 			DI::pConfig()->set(local_user(), 'securemail', 'enable', $enable);