diff --git a/phpBB/posting.php b/phpBB/posting.php
index c0008dfe93..fb5b91dde9 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -159,7 +159,7 @@ if ($sql)
 	$poll_start = (isset($poll_start)) ? (int) $poll_start : 0;
 	$poll_options = array();
 	
-	if (!isset($icon_id))
+	if (!isset($icon_id) || in_array($mode, array('quote', 'reply')))
 	{
 		$icon_id = 0;
 	}