diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index 7ce2f59ec5..3e4a294529 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -161,7 +161,7 @@ class bbcode
 							'[/quote:$uid]'	=>	$this->bbcode_tpl('quote_close', $bbcode_id)
 						),
 						'preg' => array(
-							'#\[quote="(.*?)":$uid\]#'	=>	$this->bbcode_tpl('quote_username_open', $bbcode_id)
+							'#\[quote="(.*?)":$uid\]#'	=>	$this->bbcode_tpl('quote_username_open', $bbcode_id)
 						)
 					);
 				break;
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 6617ddae74..fb7ae99743 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -163,7 +163,7 @@ class parse_message
 		// keep [code] in first position and [quote] in second position.
 		$this->bbcodes = array(
 			'code'	=>	array('bbcode_id' => 8, 'regexp' => array('#\[code(?:=([a-z]+))?\](.+\[/code\])#ise' => "\$this->bbcode_code('\$1', '\$2')")),
-			'quote'	=>	array('bbcode_id' => 0, 'regexp' => array('#\[quote(?:="(.*?)")?\](.+)\[/quote\]#ise' => "\$this->bbcode_quote('\$0')")),
+			'quote'	=>	array('bbcode_id' => 0, 'regexp' => array('#\[quote(?:="(.*?)")?\](.+)\[/quote\]#ise' => "\$this->bbcode_quote('\$0')")),
 			'b'			=>	array('bbcode_id' => 1, 'regexp' => array('#\[b\](.*?)\[/b\]#is' => '[b:' . $this->bbcode_uid . ']$1[/b:' . $this->bbcode_uid . ']')),
 			'i'			=>	array('bbcode_id' => 2, 'regexp' => array('#\[i\](.*?)\[/i\]#is' => '[i:' . $this->bbcode_uid . ']$1[/i:' . $this->bbcode_uid . ']')),
 			'url'		=>	array('bbcode_id' => 3, 'regexp' => array('#\[url=?(.*?)?\](.*?)\[/url\]#ise' => "\$this->validate_url('\$1', '\$2')")),
@@ -454,7 +454,7 @@ class parse_message
 					$tok = '[';
 					$buffer = '';
 				}
-				elseif (preg_match('#^quote(?:="(.*?)")?$#is', $buffer, $m))
+				elseif (preg_match('#^quote(?:="(.*?)")?$#is', $buffer, $m))
 				{
 					// the buffer holds a valid opening tag
 					if ($config['max_quote_depth'] && count($close_tags) >= $config['max_quote_depth'])
@@ -502,7 +502,7 @@ class parse_message
 							$username = str_replace('[', '[', str_replace(']', ']', $m[1]));
 						}
 
-						$out .= 'quote="' . $username . '":' . $this->bbcode_uid . ']';
+						$out .= 'quote="' . $username . '":' . $this->bbcode_uid . ']';
 					}
 					else
 					{
@@ -512,7 +512,7 @@ class parse_message
 					$tok = '[';
 					$buffer = '';
 				}
-				elseif (preg_match('#^quote="(.*?)#is', $buffer, $m))
+				elseif (preg_match('#^quote="(.*?)#is', $buffer, $m))
 				{
 					// the buffer holds an invalid opening tag
 					$buffer .= ']';
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 020622013e..56d0cefc07 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -768,7 +768,7 @@ if (!sizeof($error) && $preview)
 
 	$preview_message = $message_parser->message;
 	format_display($preview_message, $preview_signature, $message_parser->bbcode_uid, $preview_signature_uid, $enable_html, $enable_bbcode, $enable_urls, $enable_smilies, $enable_sig);
-	
+
 	// Poll Preview
 	if (($mode == 'post' || ($mode == 'edit' && $post_id == $topic_first_post_id && empty($poll_last_vote))) && ($auth->acl_get('f_poll', $forum_id) || $auth->acl_get('m_edit', $forum_id)))
 	{