Index: includes/EditPage.php
===================================================================
--- includes/EditPage.php   (revision 95930)
+++ includes/EditPage.php   (working copy)
@@ -1606,14 +1606,14 @@
        }

        $curUP = $wgUser->getUserPage();
-       $sk = $wgOut->getSkin();
+       // $sk = $wgOut->getSkin();
        if ( $this->mTitle->getNamespace() == NS_USER
            && substr( $this->mTitle->getPrefixedText(), 0, strlen( $curUP->getPrefixedText() ) ) != $curUP->getPrefixedText()
            && $this->formtype != 'preview'
            && $this->formtype != 'diff' )
        {
-           $utpLink = $sk->makeKnownLinkObj( $this->mTitle->getTalkPage(), wfMsgHtml( 'editinguserpagetalklink' ), 'action=edit' );
-           $wgOut->addHTML( wfMsgWikiHtml( 'editinguserpage', $utpLink ) );
+           // $utpLink = $sk->makeKnownLinkObj( $this->mTitle->getTalkPage(), wfMsgHtml( 'editinguserpagetalklink' ), 'action=edit' );
+           $wgOut->addHTML( wfMsgWikiHtml( 'editinguserpage', $this->mTitle->getTalkPage()->getFullURL( 'action=edit' ) ) );
        }

        if ( wfReadOnly() ) {
Index: languages/messages/MessagesEn.php
===================================================================
--- languages/messages/MessagesEn.php   (revision 95930)
+++ languages/messages/MessagesEn.php   (working copy)
@@ -1437,8 +1437,8 @@
 'edit-no-change'                   => 'Your edit was ignored, because no change was made to the text.',
 'edit-already-exists'              => 'Could not create a new page.
 It already exists.',
-'editinguserpage' => "'''Note:''' You are editing a [[Help:User page|user page]]. To leave this user a message, $1.",
-'editinguserpagetalklink' => 'edit their talk page',
+'editinguserpage' => "'''Note:''' You are editing a [[Help:User page|user page]]. To leave this user a message, [$1 edit their talk page].",
+'editinguserpagetalklink' => '',
 'addsection-preload'               => '', # do not translate or duplicate this message to other languages
 'addsection-editintro'             => '', # do not translate or duplicate this message to other languages