diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index b16491a6cb..c5d3ca86a7 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -261,6 +261,7 @@ p a {
 		<li>[Fix] Apply colors to guests (Bug #12219)</li>
 		<li>[Fix] Set the Admin group as founder_manage during conversion (Bug #12287)</li>
 		<li>[Fix] Fixed a special quote BBCode case (Bug #12189)</li>
+		<li>[Fix] Correctly parse BBCodes in a post when a poll is being used (Bug #11833)</li>
 
 	</ul>
 
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 56c31b7818..6a00aaf4e0 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -1538,6 +1538,7 @@ class parse_message extends bbcode_firstpass
 
 		// Parse Poll Option text ;)
 		$tmp_message = $this->message;
+		$tmp_bitfield = $this->bbcode_bitfield;
 		$this->message = $poll['poll_option_text'];
 
 
@@ -1570,8 +1571,8 @@ class parse_message extends bbcode_firstpass
 		}
 
 		$this->message = $tmp_message;
-
-		unset($tmp_message);
+		$this->bbcode_bitfield = $tmp_bitfield;
+		unset($tmp_message, $tmp_bitfield);
 
 		if (sizeof($poll['poll_options']) == 1)
 		{