diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php
index 84acd5c457..774832b436 100644
--- a/phpBB/adm/index.php
+++ b/phpBB/adm/index.php
@@ -276,7 +276,7 @@ function build_cfg_template($tpl_type, $key, &$new, $config_key, $vars)
 			$size = (int) $tpl_type[1];
 			$maxlength = (int) $tpl_type[2];
 
-			$tpl = '<input id="' . $key . '" type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '" /> x <input type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_width]" value="' . $new[$config_key . '_width'] . '" />';
+			$tpl = '<input id="' . $key . '" type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_width]" value="' . $new[$config_key . '_width'] . '" /> x <input type="text"' . (($size) ? ' size="' . $size . '"' : '') . ' maxlength="' . (($maxlength) ? $maxlength : 255) . '" name="config[' . $config_key . '_height]" value="' . $new[$config_key . '_height'] . '" />';
 		break;
 
 		case 'textarea':
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html
index c555071fee..efa06aa538 100644
--- a/phpBB/adm/style/acp_styles.html
+++ b/phpBB/adm/style/acp_styles.html
@@ -237,6 +237,7 @@
 					}
 				}
 			}
+
 		//-->
 		</script>
 
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 489b22a7d4..d8eaa81d6b 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -421,7 +421,6 @@ span.corners-bottom span {
 #menu li a:hover, #menu li a:hover span {
 	text-decoration: none;
 	background-color: #FFFFFF;
-	
 	color: #BC2A4D;
 }
 
@@ -703,7 +702,7 @@ input:hover, textarea:hover {
 	border-top: 1px solid #AFAEAA;
 	border-right: 1px solid #AFAEAA;
 	border-bottom: 1px solid #AFAEAA;
-	background-color: #E9E9E2; 
+	background-color: #E9E9E2;
 }
 
 input.langvalue, textarea.langvalue {
diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html
index 783e89d6bf..506924720e 100755
--- a/phpBB/adm/style/install_convert.html
+++ b/phpBB/adm/style/install_convert.html
@@ -30,7 +30,7 @@
 			<th>{L_SOFTWARE}</th>
 			<th>{L_VERSION}</th>
 			<th>{L_AUTHOR}</th>
-			<th>{L_OPTIONS}</th>
+			<th>{L_CONVERT_OPTIONS}</th>
 		</tr>
 		</thead>
 		<tbody>
diff --git a/phpBB/adm/swatch.php b/phpBB/adm/swatch.php
index 8573b9e530..9e537290ff 100644
--- a/phpBB/adm/swatch.php
+++ b/phpBB/adm/swatch.php
@@ -12,6 +12,7 @@
 * @ignore
 */
 define('IN_PHPBB', true);
+define('ADMIN_START', true);
 $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 include($phpbb_root_path . 'common.' . $phpEx);
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index f2f6f56698..1f628a16a8 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -210,6 +210,11 @@ p a {
 		<li>[Change] Added Code for cleaning the confirm table to the session garbage collection</li>
 		<li>[Fix] Fixed token handling in jabber class for extremely spec-compilant XMPP server (Bug #14445)</li>
 		<li>[Fix] Disallowed galleries from using special characters (Bug #14466)</li>
+		<li>[Fix] Yahoo! IM no longer supporting non-yahoo users sending messages to them over the web. Needed to use the Yahoo! uri scheme which does not work for those not having the Yahoo! IM. (Bug #14353)</li>
+		<li>[Change] Listing the board url within the email text instead of appending it to the subject (Bug #14378)</li>
+		<li>[Fix] Always display the quote button as the most accessible one - edit is always before quote (Bug #14403)</li>
+		<li>[Fix] Use correct dimension (width x height) in ACP (Bug #14452)</li>
+		<li>[Fix] Only display PM history links if there are PM's to be displayed (Bug #14484)</li>
 	</ul>
 
 	</div>
diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html
index 62fcf8e8be..6ddb1ce4b1 100644
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -242,7 +242,8 @@ p a {
 			<li>Oracle</li>
 		</ul>
 		</li>
-		<li><strong>PHP 4.3.3</strong> or above with support for the database you intend to use.</li>
+		<li><strong>PHP 4.3.3+ (>=4.3.3, >4.4.x, >5.x.x, >6.0-dev (compatible))</strong> with support for the database you intend to use.</li>
+		<li>getimagesize() function need to be enabled.</li>
 		<li>These optional presence of the following modules within PHP will provide access to additional features, but they are not required.
 		<ul>
 			<li>zlib Compression support</li>
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php
index 300e795f3b..5a176ead30 100644
--- a/phpBB/includes/acp/acp_styles.php
+++ b/phpBB/includes/acp/acp_styles.php
@@ -2101,7 +2101,7 @@ parse_css_file = {PARSE_CSS_FILE}
 				{
 					$cfg = parse_cfg_file("{$phpbb_root_path}styles/" . $style_row["{$mode}_path"] . "/theme/theme.cfg");
 
-					if (isset($cfg['parse_css_file']) && $cfg['parse_css_file'])
+					if (isset($cfg['parse_css_file']) && $cfg['parse_css_file'] && !$store_db)
 					{
 						$error[] = $user->lang['EDIT_THEME_STORE_PARSED'];
 						$store_db = 1;
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 2ce788e80a..3742d89475 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -3512,7 +3512,7 @@ function truncate_string($string, $max_length = 60, $allow_reply = true, $append
 	if (sizeof($chars) > $max_length)
 	{
 		// Cut off the last elements from the array
-		$string = implode('', array_slice($chars, 0, $max_length));
+		$string = implode('', array_slice($chars, 0, $max_length - utf8_strlen($append)));
 		$stripped = true;
 	}
 
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index cae06b743d..e19d191d2c 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -1831,9 +1831,9 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode
 		'QUOTE_IMG'			=> $user->img('icon_post_quote', $user->lang['REPLY_WITH_QUOTE']),
 		'HISTORY_TITLE'		=> $title,
 
-		'U_VIEW_NEXT_HISTORY'		=> "$url&amp;p=" . (($next_history_pm) ? $next_history_pm : $msg_id),
-		'U_VIEW_PREVIOUS_HISTORY'	=> "$url&amp;p=" . (($previous_history_pm) ? $previous_history_pm : $msg_id))
-	);
+		'U_VIEW_NEXT_HISTORY'		=> ($next_history_pm) ? "$url&amp;p=" . $next_history_pm : '',
+		'U_VIEW_PREVIOUS_HISTORY'	=> ($previous_history_pm) ? "$url&amp;p=" . $previous_history_pm : '',
+	));
 
 	return true;
 }
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index 9a3f3e8bc3..7fc6d7c0de 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -193,9 +193,9 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
 
 		'U_PM'			=> ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($user_info['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;u=' . $author_id) : '',
 		'U_WWW'			=> (!empty($user_info['user_website'])) ? $user_info['user_website'] : '',
-		'U_ICQ'			=> ($user_info['user_icq']) ? 'http://www.icq.com/people/webmsg.php?to=' . $user_info['user_icq'] : '',
+		'U_ICQ'			=> ($user_info['user_icq']) ? 'http://www.icq.com/people/webmsg.php?to=' . urlencode($user_info['user_icq']) : '',
 		'U_AIM'			=> ($user_info['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=aim&amp;u=' . $author_id) : '',
-		'U_YIM'			=> ($user_info['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . $user_info['user_yim'] . '&amp;.src=pg' : '',
+		'U_YIM'			=> ($user_info['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($user_info['user_yim']) . '&amp;.src=pg' : '',
 		'U_MSN'			=> ($user_info['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=msnm&amp;u=' . $author_id) : '',
 		'U_JABBER'		=> ($user_info['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=jabber&amp;u=' . $author_id) : '',
 
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
index 0f2486d874..3311ade5ad 100644
--- a/phpBB/install/install_convert.php
+++ b/phpBB/install/install_convert.php
@@ -273,7 +273,7 @@ class install_convert extends module
 			'L_AVAILABLE_CONVERTORS'	=> $lang['AVAILABLE_CONVERTORS'],
 			'L_CONVERT'					=> $lang['CONVERT'],
 			'L_NO_CONVERTORS'			=> $lang['NO_CONVERTORS'],
-			'L_OPTIONS'					=> $lang['OPTIONS'],
+			'L_OPTIONS'					=> $lang['CONVERT_OPTIONS'],
 			'L_SOFTWARE'				=> $lang['SOFTWARE'],
 			'L_VERSION'					=> $lang['VERSION'],
 
@@ -521,7 +521,7 @@ class install_convert extends module
 				set_config('convert_options', serialize(array('forum_path' => './../' . $forum_path, 'refresh' => $refresh)), true);
 
 				$template->assign_block_vars('checks', array(
-					'TITLE'		=> $lang['SPECIFY_OPTIONS'],
+					'TITLE'		=> $lang['VERIFY_OPTIONS'],
 					'RESULT'	=> $lang['CONVERT_SETTINGS_VERIFIED'],
 				));
 
@@ -536,7 +536,7 @@ class install_convert extends module
 			else
 			{
 				$template->assign_block_vars('checks', array(
-					'TITLE'		=> $lang['SPECIFY_OPTIONS'],
+					'TITLE'		=> $lang['VERIFY_OPTIONS'],
 					'RESULT'	=> '<b style="color:red">' . implode('<br />', $error) . '</b>',
 				));
 			}
diff --git a/phpBB/language/en/email/admin_welcome_inactive.txt b/phpBB/language/en/email/admin_welcome_inactive.txt
index 0d75f33c18..746d13da7a 100644
--- a/phpBB/language/en/email/admin_welcome_inactive.txt
+++ b/phpBB/language/en/email/admin_welcome_inactive.txt
@@ -1,4 +1,4 @@
-Subject: Welcome to "{SITENAME}" - {U_BOARD}
+Subject: Welcome to "{SITENAME}"
 
 {WELCOME_MSG}
 
@@ -7,6 +7,8 @@ Please keep this e-mail for your records. Your account information is as follows
 ----------------------------
 Username: {USERNAME}
 Password: {PASSWORD}
+
+Board URL: {U_BOARD}
 ----------------------------
 
 Your account is currently inactive, the administrator of the board will need to activate it before you can log in. You will receive another e-mail when this has occurred.
diff --git a/phpBB/language/en/email/coppa_resend_inactive.txt b/phpBB/language/en/email/coppa_resend_inactive.txt
index ab8363b350..9d43ca4f85 100644
--- a/phpBB/language/en/email/coppa_resend_inactive.txt
+++ b/phpBB/language/en/email/coppa_resend_inactive.txt
@@ -1,4 +1,4 @@
-Subject: Welcome to "{SITENAME}" - {U_BOARD}
+Subject: Welcome to "{SITENAME}"
 
 {WELCOME_MSG}
 
@@ -13,7 +13,7 @@ OR mail it to:
 {MAIL_INFO}
 
 ------------------------------ CUT HERE ------------------------------
-Permission to participate at "{SITENAME}"
+Permission to participate at "{SITENAME}" - {U_BOARD}
 
 Username: {USERNAME}
 E-mail: {EMAIL_ADDRESS}
diff --git a/phpBB/language/en/email/coppa_welcome_inactive.txt b/phpBB/language/en/email/coppa_welcome_inactive.txt
index f34479a6fe..f079ddb838 100644
--- a/phpBB/language/en/email/coppa_welcome_inactive.txt
+++ b/phpBB/language/en/email/coppa_welcome_inactive.txt
@@ -1,4 +1,4 @@
-Subject: Welcome to "{SITENAME}" - {U_BOARD}
+Subject: Welcome to "{SITENAME}"
 
 {WELCOME_MSG}
 
@@ -13,7 +13,7 @@ OR mail it to:
 {MAIL_INFO}
 
 ------------------------------ CUT HERE ------------------------------
-Permission to participate at "{SITENAME}"
+Permission to participate at "{SITENAME}" - {U_BOARD}
 
 Username: {USERNAME}
 Password: {PASSWORD}
diff --git a/phpBB/language/en/email/user_reactivate_account.txt b/phpBB/language/en/email/user_reactivate_account.txt
index 260e69c380..b5639d0b7a 100644
--- a/phpBB/language/en/email/user_reactivate_account.txt
+++ b/phpBB/language/en/email/user_reactivate_account.txt
@@ -1,4 +1,4 @@
-Subject: Reactivate your account on "{SITENAME}" - {U_BOARD}
+Subject: Reactivate your account on "{SITENAME}"
 
 A board administrator requested that your account be reactivated. Your account is currently inactive.
 Please follow the steps listed here to reactivate your account.
diff --git a/phpBB/language/en/email/user_resend_inactive.txt b/phpBB/language/en/email/user_resend_inactive.txt
index f0a0034aa5..5635801b80 100644
--- a/phpBB/language/en/email/user_resend_inactive.txt
+++ b/phpBB/language/en/email/user_resend_inactive.txt
@@ -1,4 +1,4 @@
-Subject: Welcome to "{SITENAME}" - {U_BOARD}
+Subject: Welcome to "{SITENAME}"
 
 {WELCOME_MSG}
 
diff --git a/phpBB/language/en/email/user_welcome.txt b/phpBB/language/en/email/user_welcome.txt
index 52957082fb..6c3cee0b50 100644
--- a/phpBB/language/en/email/user_welcome.txt
+++ b/phpBB/language/en/email/user_welcome.txt
@@ -1,4 +1,4 @@
-Subject: Welcome to "{SITENAME}" - {U_BOARD}
+Subject: Welcome to "{SITENAME}"
 
 {WELCOME_MSG}
 
@@ -7,6 +7,8 @@ Please keep this e-mail for your records. Your account information is as follows
 ----------------------------
 Username: {USERNAME}
 Password: {PASSWORD}
+
+Board URL: {U_BOARD}
 ----------------------------
 
 Please do not forget your password as it has been encrypted in our database and we cannot retrieve it for you. However, should you forget your password you can request a new one which will be activated in the same way as this account.
diff --git a/phpBB/language/en/email/user_welcome_inactive.txt b/phpBB/language/en/email/user_welcome_inactive.txt
index 3cd5e3c2ea..4b6d96ddd8 100644
--- a/phpBB/language/en/email/user_welcome_inactive.txt
+++ b/phpBB/language/en/email/user_welcome_inactive.txt
@@ -1,4 +1,4 @@
-Subject: Welcome to "{SITENAME}" - {U_BOARD}
+Subject: Welcome to "{SITENAME}"
 
 {WELCOME_MSG}
 
@@ -7,6 +7,8 @@ Please keep this e-mail for your records. Your account information is as follows
 ----------------------------
 Username: {USERNAME}
 Password: {PASSWORD}
+
+Board URL: {U_BOARD}
 ----------------------------
 
 Your account is currently inactive. You cannot use it until you visit the following link:
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index 945e25297c..df45be62c3 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -79,8 +79,9 @@ $lang = array_merge($lang, array(
 	'CONVERT_INTRO_BODY'		=> 'From here, you are able to import data from other (installed) board systems. The list below shows all the conversion modules currently available. If there is no convertor shown in this list for the board software you wish to convert from, please check our website where further conversion modules may be available for download.',
 	'CONVERT_NEW_CONVERSION'	=> 'New conversion',
 	'CONVERT_NOT_EXIST'			=> 'The specified convertor does not exist.',
+	'CONVERT_OPTIONS'			=> 'Options',
 	'CONVERT_SETTINGS_VERIFIED'	=> 'The information you entered has been verified. To start the conversion process, push the button below to begin.',
-	'CONV_ERR_FATAL'					=> 'Fatal conversion error',
+	'CONV_ERR_FATAL'			=> 'Fatal conversion error',
 
 	'CONV_ERROR_ATTACH_FTP_DIR'			=> 'FTP upload for attachments is enabled at the old board. Please disable the FTP upload option and make sure a valid upload directory is specified, then copy all attachment files to this new web accessible directory. Once you have done this, restart the convertor.',
 	'CONV_ERROR_CONFIG_EMPTY'			=> 'There is no configuration information available for the conversion.',
@@ -350,6 +351,7 @@ $lang = array_merge($lang, array(
 	'UNWRITABLE'				=> 'Unwritable',
 	'UPDATE_TOPICS_POSTED'		=> 'Generating topics posted information',
 	'UPDATE_TOPICS_POSTED_ERR'	=> 'An error occured while generating topics posted information. You can retry this step in the ACP after the conversion process is completed.',
+	'VERIFY_OPTIONS'			=> 'Verifying conversion options',
 	'VERSION'					=> 'Version',
 
 	'WELCOME_INSTALL'			=> 'Welcome to phpBB3 Installation',
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 33ddc3ba08..cea0afc9a8 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1531,9 +1531,9 @@ function show_profile($data)
 		'U_PM'			=> ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($data['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=compose&amp;u=' . $user_id) : '',
 		'U_EMAIL'		=> $email,
 		'U_WWW'			=> (!empty($data['user_website'])) ? $data['user_website'] : '',
-		'U_ICQ'			=> ($data['user_icq']) ? 'http://www.icq.com/people/webmsg.php?to=' . $data['user_icq'] : '',
+		'U_ICQ'			=> ($data['user_icq']) ? 'http://www.icq.com/people/webmsg.php?to=' . urlencode($data['user_icq']) : '',
 		'U_AIM'			=> ($data['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=aim&amp;u=' . $user_id) : '',
-		'U_YIM'			=> ($data['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . $data['user_yim'] . '&amp;.src=pg' : '',
+		'U_YIM'			=> ($data['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($data['user_yim']) . '&amp;.src=pg' : '',
 		'U_MSN'			=> ($data['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=msnm&amp;u=' . $user_id) : '',
 		'U_JABBER'		=> ($data['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&amp;action=jabber&amp;u=' . $user_id) : '',
 		'LOCATION'		=> ($data['user_from']) ? $data['user_from'] : '',
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 23dfe073fd..5e150e2380 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -6,7 +6,7 @@
 		<div class="inner"><span class="corners-top"><span></span></span>
 
 		<ul class="linklist">
-			<li><a class="icon-home" href="{U_INDEX}" accesskey="h">{L_INDEX}</a></li>
+			<li class="icon-home"><a href="{U_INDEX}" accesskey="h">{L_INDEX}</a></li>
 				<!-- IF not S_IS_BOT -->
 					<!-- IF S_WATCH_FORUM_LINK --><li><a href="{S_WATCH_FORUM_LINK}" <!-- IF S_WATCHING_FORUM -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF --> title="{S_WATCH_FORUM_TITLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF -->
 					<!-- IF U_WATCH_TOPIC --><li><a href="{U_WATCH_TOPIC}" title="{L_WATCH_TOPIC}" <!-- IF S_WATCHING_TOPIC -->class="icon-unsubscribe"<!-- ELSE -->class="icon-subscribe"<!-- ENDIF -->>{L_WATCH_TOPIC}</a></li><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index 539bd58dce..a760328ee8 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -5,10 +5,10 @@
 	<span class="corners-bottom"><span></span></span></div>
 </div>
 
-<!-- IF S_DISPLAY_HISTORY -->
+<!-- IF S_DISPLAY_HISTORY and (U_VIEW_PREVIOUS_HISTORY or U_VIEW_NEXT_HISTORY) -->
 	<fieldset class="display-options clearfix">
-		<a href="{U_VIEW_PREVIOUS_HISTORY}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_HISTORY}</a>
-		<a href="{U_VIEW_NEXT_HISTORY}" class="right-box {S_CONTENT_FLOW_END}">{L_VIEW_NEXT_HISTORY}</a>
+		<!-- IF U_VIEW_PREVIOUS_HISTORY --><a href="{U_VIEW_PREVIOUS_HISTORY}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_VIEW_PREVIOUS_HISTORY}</a><!-- ENDIF -->
+		<!-- IF U_VIEW_NEXT_HISTORY --><a href="{U_VIEW_NEXT_HISTORY}" class="right-box {S_CONTENT_FLOW_END}">{L_VIEW_NEXT_HISTORY}</a><!-- ENDIF -->
 	</fieldset>
 <!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 970f2fb1a6..08fd7deed0 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -124,12 +124,12 @@
 		<!-- IF not S_IS_BOT -->
 			<!-- IF postrow.U_QUOTE or postrow.U_INFO or postrow.U_DELETE or postrow.U_EDIT -->
 				<ul class="profile-icons">
-					<!-- IF postrow.U_QUOTE --><li class="quote-icon"><a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}"><span>{L_REPLY_WITH_QUOTE}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_EDIT --><li class="edit-icon"><a href="{postrow.U_EDIT}" title="{L_EDIT_POST}"><span>{L_EDIT_POST}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_DELETE --><li class="delete-icon"><a href="{postrow.U_DELETE}" title="{L_DELETE_POST}"><span>{L_DELETE_POST}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_REPORT --><li class="report-icon"><a href="{postrow.U_REPORT}" title="{L_REPORT_POST}"><span>{L_REPORT_POST}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_WARN --><li class="warn-icon"><a href="{postrow.U_WARN}" title="{L_WARN_USER}"><span>{L_WARN_USER}</span></a></li><!-- ENDIF -->
 					<!-- IF postrow.U_INFO --><li class="info-icon"><a href="{postrow.U_INFO}" title="{L_INFORMATION}"><span>{L_INFORMATION}</span></a></li><!-- ENDIF -->
+					<!-- IF postrow.U_QUOTE --><li class="quote-icon"><a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}"><span>{L_REPLY_WITH_QUOTE}</span></a></li><!-- ENDIF -->
 				</ul>
 			<!-- ENDIF -->
 		<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index 12a53e281c..fb132ff87e 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -579,7 +579,6 @@ dl.file dd {
 dl.thumbnail img {
 	padding: 3px;
 	border: 1px solid #666666;
-	display: block;
 	background-color: #FFF;
 }
 
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_message_header.html b/phpBB/styles/subsilver2/template/ucp_pm_message_header.html
index 0bbf658600..370fa673dd 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_message_header.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_message_header.html
@@ -21,7 +21,7 @@
 			<!-- IF S_VIEW_MESSAGE -->
 				<span class="gensmall">
 				<!-- IF S_DISPLAY_HISTORY -->
-					<a href="{U_VIEW_PREVIOUS_HISTORY}">{L_VIEW_PREVIOUS_HISTORY}</a> | <a href="{U_VIEW_NEXT_HISTORY}">{L_VIEW_NEXT_HISTORY}</a> | 
+					<!-- IF U_VIEW_PREVIOUS_HISTORY --><a href="{U_VIEW_PREVIOUS_HISTORY}">{L_VIEW_PREVIOUS_HISTORY}</a> | <!-- ENDIF --><!-- IF U_VIEW_NEXT_HISTORY --><a href="{U_VIEW_NEXT_HISTORY}">{L_VIEW_NEXT_HISTORY}</a> | <!-- ENDIF -->
 				<!-- ENDIF --><a href="{U_PREVIOUS_PM}">{L_VIEW_PREVIOUS_PM}</a> | <a href="{U_NEXT_PM}">{L_VIEW_NEXT_PM}</a>&nbsp;
 				</span>
 			<!-- ENDIF -->
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html
index 9b41965fd8..b3387681bc 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_viewmessage.html
@@ -104,7 +104,7 @@
 </tr>
 
 <tr class="row1">
-	<td><div class="gensmall" style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<!-- IF U_MESSAGE_AUTHOR --><a href="{U_MESSAGE_AUTHOR}">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF U_EMAIL --><a href="{U_EMAIL}">{EMAIL_IMG}</a> <!-- ENDIF -->&nbsp;</div> <div class="gensmall" style="float: {S_CONTENT_FLOW_END};"><!-- IF U_QUOTE --><a href="{U_QUOTE}">{QUOTE_IMG}</a> <!-- ENDIF --> <!-- IF U_POST_REPLY_PM --><a href="{U_POST_REPLY_PM}">{REPLY_IMG}</a><!-- ENDIF --> <!-- IF U_EDIT --><a href="{U_EDIT}">{EDIT_IMG}</a> <!-- ENDIF -->&nbsp;</div></td>
+	<td><div class="gensmall" style="float: {S_CONTENT_FLOW_BEGIN};">&nbsp;<!-- IF U_MESSAGE_AUTHOR --><a href="{U_MESSAGE_AUTHOR}">{PROFILE_IMG}</a> <!-- ENDIF --> <!-- IF U_EMAIL --><a href="{U_EMAIL}">{EMAIL_IMG}</a> <!-- ENDIF -->&nbsp;</div> <div class="gensmall" style="float: {S_CONTENT_FLOW_END};"><!-- IF U_EDIT --><a href="{U_EDIT}">{EDIT_IMG}</a> <!-- ENDIF --> <!-- IF U_QUOTE --><a href="{U_QUOTE}">{QUOTE_IMG}</a> <!-- ENDIF --> <!-- IF U_POST_REPLY_PM --><a href="{U_POST_REPLY_PM}">{REPLY_IMG}</a><!-- ENDIF -->&nbsp;</div></td>
 </tr>
 
 <tr>
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index e608baadd8..4f67ba717f 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1040,7 +1040,7 @@ while ($row = $db->sql_fetchrow($result))
 				'www'			=> $row['user_website'],
 				'aim'			=> ($row['user_aim'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=aim&amp;u=$poster_id") : '',
 				'msn'			=> ($row['user_msnm'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=msnm&amp;u=$poster_id") : '',
-				'yim'			=> ($row['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . $row['user_yim'] . '&amp;.src=pg' : '',
+				'yim'			=> ($row['user_yim']) ? 'http://edit.yahoo.com/config/send_webmesg?.target=' . urlencode($row['user_yim']) . '&amp;.src=pg' : '',
 				'jabber'		=> ($row['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=jabber&amp;u=$poster_id") : '',
 				'search'		=> ($auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", 'search_author=' . urlencode($row['username']) .'&amp;showresults=posts') : '',
 			);