diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php
index fdd2ba9d8d..1daad04d84 100755
--- a/phpBB/includes/mcp/mcp_reports.php
+++ b/phpBB/includes/mcp/mcp_reports.php
@@ -222,11 +222,11 @@ class mcp_reports
 
 				if ($mode == 'reports')
 				{
-					$report_state = 'AND p.post_reported = 1';
+					$report_state = 'AND p.post_reported = 1 AND r.report_closed = 0';
 				}
 				else
 				{
-					$report_state = 'AND p.post_reported = 0 AND r.report_closed = 1';
+					$report_state = 'AND r.report_closed = 1';
 				}
 
 				$sql = 'SELECT p.post_id
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index d7e9ba937b..854a472133 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -249,7 +249,6 @@ $lang = array_merge($lang, array(
 	'REPORTS_DELETED_SUCCESS'	=> 'The selected reports have been deleted successfully.',
 	'REPORTS_TOTAL'			=> 'In total there are <b>%d</b> reports to review',
 	'REPORTS_ZERO_TOTAL'	=> 'There are no reports to review',
-	'REPORT_ALREADY_DEALT_WITH'		=> 'This post has already been reported previously and successfully dealt with',
 	'REPORT_CLOSED'			=> 'This report has previously been closed.',
 	'REPORT_CLOSED_SUCCESS'	=> 'The selected report has been closed successfully.',
 	'REPORT_DELETED_SUCCESS'	=> 'The selected report has been deleted successfully.',
diff --git a/phpBB/mcp.php b/phpBB/mcp.php
index 54a1912149..1060e0c8fc 100644
--- a/phpBB/mcp.php
+++ b/phpBB/mcp.php
@@ -401,11 +401,11 @@ function mcp_sorting($mode, &$sort_days, &$sort_key, &$sort_dir, &$sort_by_sql,
 
 			if ($mode == 'reports')
 			{
-				$where_sql .= 'AND r.report_closed = 0';
+				$where_sql .= ' AND r.report_closed = 0';
 			}
 			else
 			{
-				$where_sql .= 'AND r.report_closed = 1';
+				$where_sql .= ' AND r.report_closed = 1';
 			}
 
 			$sql = 'SELECT COUNT(r.report_id) AS total
diff --git a/phpBB/report.php b/phpBB/report.php
index 61f1dd34d2..236b7008e4 100644
--- a/phpBB/report.php
+++ b/phpBB/report.php
@@ -69,17 +69,9 @@ foreach ($acl_check_ary as $acl => $error)
 }
 unset($acl_check_ary);
 
-// Check if the post has already been reported...
-$sql = 'SELECT report_id, report_closed
-	FROM ' . REPORTS_TABLE . "
-	WHERE post_id = $post_id";
-$result = $db->sql_query($sql);
-$row = $db->sql_fetchrow($result);
-$db->sql_freeresult($result);
-
-if ($row)
+if ($report_data['post_reported'])
 {
-	$message = ($row['report_closed']) ? $user->lang['REPORT_ALREADY_DEALT_WITH'] : $user->lang['ALREADY_REPORTED'];
+	$message = $user->lang['ALREADY_REPORTED'];
 	$message .= '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $phpbb_root_path . $redirect_url . '">', '</a>');
 	trigger_error($message);
 }
@@ -88,7 +80,7 @@ if ($row)
 if (isset($_POST['submit']) && $reason_id)
 {
 	$sql = 'SELECT *
-		FROM ' . REASONS_TABLE . " 
+		FROM ' . REASONS_TABLE . "
 		WHERE reason_id = $reason_id";
 	$result = $db->sql_query($sql);
 	$row = $db->sql_fetchrow($result);
@@ -115,16 +107,16 @@ if (isset($_POST['submit']) && $reason_id)
 
 	if (!$report_data['post_reported'])
 	{
-		$sql = 'UPDATE ' . POSTS_TABLE . ' 
-			SET post_reported = 1 
+		$sql = 'UPDATE ' . POSTS_TABLE . '
+			SET post_reported = 1
 			WHERE post_id = ' . $post_id;
 		$db->sql_query($sql);
 	}
 
 	if (!$report_data['topic_reported'])
 	{
-		$sql = 'UPDATE ' . TOPICS_TABLE . ' 
-			SET topic_reported = 1 
+		$sql = 'UPDATE ' . TOPICS_TABLE . '
+			SET topic_reported = 1
 			WHERE topic_id = ' . $report_data['topic_id'];
 		$db->sql_query($sql);
 	}