diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index d8a5432113..c0df48416c 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -135,6 +135,7 @@
 		<li>[Fix] Sort backups by date, newest first (Bug #14818)</li>
 		<li>[Fix] Prevent incomplete backups stored if option &quot;store and download&quot; is selected and admin cancel download by removing the option. (Bug #20325)</li>
 		<li>[Fix] Enforce correct case for template variables</li>
+		<li>[Fix] "Select all" selects much too much in Opera (Bug #42885 - Patch by TerraFrost)</li>
 		<li>[Change] Allow download of conflicting file for later reference in automatic updater</li>
 		<li>[Change] Default difference view is now 'inline' instead of 'side by side'</li>
 		<li>[Change] Added new option for merging differences to conflicting files in automatic updater</li>
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index ed09cfa6bd..2f72ad8fdc 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -453,7 +453,7 @@ class bbcode_firstpass extends bbcode
 			break;
 
 			default:
-				return '[code:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars($code) . '[/code:' . $this->bbcode_uid . ']';
+				return '[code:' . $this->bbcode_uid . ']' . $this->bbcode_specialchars(trim($code)) . '[/code:' . $this->bbcode_uid . ']';
 			break;
 		}
 	}