1 files changed, 4 insertions, 6 deletions
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 32aaa3e533..df23bcd98f 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -558,12 +558,11 @@ function approve_post($post_id_list, $mode)
 				);
 
 				$messenger->send($post_data['user_notify_type']);
-				$messenger->reset();
 			}
-
-			$messenger->save_queue();
 		}
 
+		$messenger->save_queue();
+
 		// Send out normal user notifications
 		$email_sig = str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']);
 
@@ -780,13 +779,12 @@ function disapprove_post($post_id_list, $mode)
 				);
 
 				$messenger->send($post_data['user_notify_type']);
-				$messenger->reset();
 			}
-
-			$messenger->save_queue();
 		}
 		unset($post_info, $disapprove_reason);
 
+		$messenger->save_queue();
+
 		if (sizeof($forum_topics_real))
 		{
 			$success_msg = ($num_disapproved == 1) ? 'TOPIC_DISAPPROVED_SUCCESS' : 'TOPICS_DISAPPROVED_SUCCESS';