Index: wp-includes/link-template.php
===================================================================
--- wp-includes/link-template.php	(revision 5961)
+++ wp-includes/link-template.php	(working copy)
@@ -140,7 +140,8 @@
 	$pagestruct = $wp_rewrite->get_page_permastruct();
 
 	if ( '' != $pagestruct && 'draft' != $post->post_status ) {
-		$link = get_page_uri($id);
+		// Encode the page uri as it comes back in a raw form	
+		$link = urlencode(get_page_uri($id));
 		$link = str_replace('%pagename%', $link, $pagestruct);
 		$link = get_option('home') . "/$link";
 		$link = user_trailingslashit($link, 'page');