Index: tests/phpunit/includes/MessageTest.php
===================================================================
--- tests/phpunit/includes/MessageTest.php	(revision 113595)
+++ tests/phpunit/includes/MessageTest.php	(working copy)
@@ -15,7 +15,9 @@
 		$this->assertInstanceOf( 'Message', wfMessage( 'mainpage' ) );
 		$this->assertInstanceOf( 'Message', wfMessage( 'i-dont-exist-evar' ) );
 		$this->assertEquals( 'Main Page', wfMessage( 'mainpage' )->text() );
-		$this->assertEquals( '<i-dont-exist-evar>', wfMessage( 'i-dont-exist-evar' )->text() );
+		$this->assertEquals( '<<i-dont-exist-evar>>', wfMessage( 'i-dont-exist-evar' )->plain() );
+		$this->assertEquals( '<<i-dont-exist-evar>>', wfMessage( 'i-dont-exist-evar' )->text() );
+		$this->assertEquals( '&lt;&lt;i-dont-exist-evar&gt;&gt;', wfMessage( 'i-dont-exist-evar' )->escaped() );
 	}
 
 	function testInLanguage() {
Index: includes/Message.php
===================================================================
--- includes/Message.php	(revision 113595)
+++ includes/Message.php	(working copy)
@@ -567,7 +567,7 @@
 	protected function getMessageText() {
 		$message = $this->fetchMessage();
 		if ( $message === false ) {
-			return '&lt;' . htmlspecialchars( is_array($this->key) ? $this->key[0] : $this->key ) . '&gt;';
+			return '<<' . (is_array($this->key) ? $this->key[0] : $this->key) . '>>';
 		} else {
 			return $message;
 		}