diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php
index 00ce89317c..1e412d0461 100644
--- a/phpBB/includes/acp/acp_email.php
+++ b/phpBB/includes/acp/acp_email.php
@@ -227,6 +227,7 @@ class acp_email
 					$used_lang = $email_list[$i][0]['lang'];
 					$used_method = $email_list[$i][0]['method'];
 
+					/** @var \phpbb\messenger\method\base $messenger_method */
 					foreach ($messenger_collection_iterator as $messenger_method)
 					{
 						$notify_method = $messenger_method->get_id();
@@ -272,6 +273,7 @@ class acp_email
 
 				if ($use_queue)
 				{
+					/** @var \phpbb\messenger\method\base $messenger_method */
 					foreach ($messenger_collection_iterator as $messenger_method)
 					{
 						$messenger_method->save_queue();
diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php
index 2436277e15..641beb4d0e 100644
--- a/phpBB/includes/acp/acp_inactive.php
+++ b/phpBB/includes/acp/acp_inactive.php
@@ -205,6 +205,7 @@ class acp_inactive
 
 						do
 						{
+							/** @var \phpbb\messenger\method\base $messenger_method */
 							foreach ($messenger_collection_iterator as $messenger_method)
 							{
 								if ($messenger_method->get_id() == $user_row['user_notify_type'] || $user_row['user_notify_type'] == $messenger_method::NOTIFY_BOTH)
@@ -227,6 +228,7 @@ class acp_inactive
 						}
 						while ($row = $db->sql_fetchrow($result));
 
+						/** @var \phpbb\messenger\method\base $messenger_method */
 						foreach ($messenger_collection_iterator as $messenger_method)
 						{
 							$messenger_method->save_queue();
diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php
index c9dd3e553e..5500604721 100644
--- a/phpBB/includes/ucp/ucp_activate.php
+++ b/phpBB/includes/ucp/ucp_activate.php
@@ -133,6 +133,8 @@ class ucp_activate
 
 			$messenger = $phpbb_container->get('messenger.method_collection');
 			$messenger_collection_iterator = $messenger->getIterator();
+
+			/** @var \phpbb\messenger\method\base $messenger_method */
 			foreach ($messenger_collection_iterator as $messenger_method)
 			{
 				if ($messenger_method->get_id() == $user_row['user_notify_type'] || $user_row['user_notify_type'] == $messenger_method::NOTIFY_BOTH)
diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php
index 76e748e85d..259eaf97ef 100644
--- a/phpBB/includes/ucp/ucp_resend.php
+++ b/phpBB/includes/ucp/ucp_resend.php
@@ -138,6 +138,7 @@ class ucp_resend
 				$messenger_collection_iterator = $messenger->getIterator();
 				while ($row = $db->sql_fetchrow($result))
 				{
+					/** @var \phpbb\messenger\method\base $messenger_method */
 					foreach ($messenger_collection_iterator as $messenger_method)
 					{
 						$messenger_method->set_use_queue(false);
@@ -153,16 +154,13 @@ class ucp_resend
 							]);
 
 							$messenger_method->send();
+
+							// Save the queue in the messenger method class (has to be called or these messages could be lost)
+							$messenger_method->save_queue();
 						}
 					}
 				}
 				$db->sql_freeresult($result);
-
-				// Save the queue in the messenger method class (has to be called or these messages could be lost)
-				foreach ($messenger_collection_iterator as $messenger_method)
-				{
-					$messenger_method->save_queue();
-				}
 			}
 
 			$this->update_activation_expiration();
diff --git a/phpBB/phpbb/message/message.php b/phpBB/phpbb/message/message.php
index 90b8a1ff5f..581ba17e46 100644
--- a/phpBB/phpbb/message/message.php
+++ b/phpBB/phpbb/message/message.php
@@ -249,6 +249,8 @@ class message
 		{
 			/** @psalm-suppress InvalidTemplateParam */
 			$messenger_collection_iterator = $messenger->getIterator();
+
+			/** @var \phpbb\messenger\method\base $messenger_method */
 			foreach ($messenger_collection_iterator as $messenger_method)
 			{
 				$messenger_method->set_use_queue(false);
diff --git a/phpBB/phpbb/messenger/queue.php b/phpBB/phpbb/messenger/queue.php
index abcc29c1bd..50384bfd82 100644
--- a/phpBB/phpbb/messenger/queue.php
+++ b/phpBB/phpbb/messenger/queue.php
@@ -116,6 +116,8 @@ class queue
 
 		/** @psalm-suppress InvalidTemplateParam */
 		$messenger_collection_iterator = $this->messenger_method_collection->getIterator();
+
+		/** @var \phpbb\messenger\method\base $messenger_method */
 		foreach ($messenger_collection_iterator as $messenger_method)
 		{
 			if (isset($this->queue_data[$messenger_method->get_queue_object_name()]))
diff --git a/phpBB/phpbb/notification/method/messenger_base.php b/phpBB/phpbb/notification/method/messenger_base.php
index 7acc608cc2..e59176a8a2 100644
--- a/phpBB/phpbb/notification/method/messenger_base.php
+++ b/phpBB/phpbb/notification/method/messenger_base.php
@@ -114,6 +114,7 @@ abstract class messenger_base extends \phpbb\notification\method\base
 				continue;
 			}
 
+			/** @var \phpbb\messenger\method\base $messenger_method */
 			foreach ($messenger_collection_iterator as $messenger_method)
 			{
 				if ($messenger_method->get_id() == $notify_method || $notify_method == $messenger_method::NOTIFY_BOTH)