diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 4ccdc1b3ec..d4be3ec65e 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1647,7 +1647,7 @@ function decode_message(&$message, $bbcode_uid = '')
 		'#<.*?>#s'
 	);
 	
-	$replace = array('\1', '\1', '\1', '\1', '\1', '', '&lt;\1&gt;');
+	$replace = array('\1', '\1', '\1', '\1', '\1', '', '');
 	
 	$message = preg_replace($match, $replace, $message);
 
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 6ac71e86db..b722549720 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -577,7 +577,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas
 			switch ($mode)
 			{
 				case 'user':
-					$sql_where = 'WHERE session_user_id IN (' . implode(', ', $banlist_ary) . ')';
+					$sql_where = (in_array('*', $banlist_ary)) ? '' : 'WHERE session_user_id IN (' . implode(', ', $banlist_ary) . ')';
 				break;
 
 				case 'ip':
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index d05dd1e48f..ddb783e4b7 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -288,7 +288,7 @@ class bbcode_firstpass extends bbcode
 			'#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#',
 			'#&\#([0-9]+);#',
 		);
-		$htm_replace = array('\1', '\1', '\1', '\1', '\1', '&lt;\1&gt;', '&amp;#\1;');
+		$htm_replace = array('\1', '\1', '\1', '\1', '\1', '&amp;#\1;');
 
 		$out = '';
 
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index cf074bb0c5..6571ff1433 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -723,7 +723,7 @@ class session
 	*
 	* Checks whether the supplied user is banned by id, ip or email. If no parameters
 	* are passed to the method pre-existing session data is used. If $return is false
-	* this routine does not return on finding a banned user , it outputs a relevant 
+	* this routine does not return on finding a banned user, it outputs a relevant 
 	* message and stops execution.
 	*/
 	function check_ban($user_id = false, $user_ip = false, $user_email = false, $return = false)
diff --git a/phpBB/styles/subSilver/theme/stylesheet.css b/phpBB/styles/subSilver/theme/stylesheet.css
index 1654b32de5..a88b0b77b2 100644
--- a/phpBB/styles/subSilver/theme/stylesheet.css
+++ b/phpBB/styles/subSilver/theme/stylesheet.css
@@ -35,6 +35,10 @@ body {
 	margin: 0;
 }
 
+ul, li {
+	margin-left: 20px;
+}
+
 #wrapheader {
 	height: 120px;
 	background-image: url('./images/background.gif');