diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php
index b9ff966b6d..2436277e15 100644
--- a/phpBB/includes/acp/acp_inactive.php
+++ b/phpBB/includes/acp/acp_inactive.php
@@ -227,6 +227,11 @@ class acp_inactive
 						}
 						while ($row = $db->sql_fetchrow($result));
 
+						foreach ($messenger_collection_iterator as $messenger_method)
+						{
+							$messenger_method->save_queue();
+						}
+
 						// Add the remind state to the database and increase activation expiration by one day
 						$sql = 'UPDATE ' . USERS_TABLE . '
 							SET user_reminded = user_reminded + 1,
@@ -241,11 +246,6 @@ class acp_inactive
 					}
 					$db->sql_freeresult($result);
 
-					foreach ($messenger_collection_iterator as $messenger_method)
-					{
-						$messenger_method->save_queue();
-					}
-
 					// For remind we really need to redirect, else a refresh can result in more than one reminder
 					$u_action = $this->u_action . "&$u_sort_param&start=$start";
 					$u_action .= ($per_page != $config['topics_per_page']) ? "&users_per_page=$per_page" : '';