diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index f1d51c8d71..cb31e3567a 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2593,8 +2593,7 @@ function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port
 	{
 		if ($errstr)
 		{
-			// convert possible localized errstr to utf8
-			// $errstr = utf8_convert_message($errstr);
+			$errstr = utf8_convert_message($errstr);
 			return false;
 		}
 		else
diff --git a/phpBB/styles/subSilver/template/memberlist_search.html b/phpBB/styles/subSilver/template/memberlist_search.html
index b602ab8aa6..99c509e550 100644
--- a/phpBB/styles/subSilver/template/memberlist_search.html
+++ b/phpBB/styles/subSilver/template/memberlist_search.html
@@ -1,34 +1,62 @@
 <!-- You should retain this javascript in your own template! -->
-<!-- IF S_SEARCH_USER and S_FORM_NAME -->
-<script language="javascript" type="text/javascript">
-<!--
-function insert_user(user)
-{
-	opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value = ( opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value.length && opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.type == "textarea" ) ? opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value + "\n" + user : user;
-}
 
-function insert_marked(users)
-{
-	if (typeof(users.length) == "undefined")
-	{
-		insert_user(users.value);
-	}
-	else if (users.length > 0)
-	{
-		for (i = 0; i < users.length; i++)
+<!-- IF S_SEARCH_USER and S_FORM_NAME -->
+	<script type="text/javascript">
+	<!--
+		function insert_user(user)
 		{
-			if (users[i].checked)
+			opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value = ( opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value.length && opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.type == "textarea" ) ? opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value + "\n" + user : user;
+		}
+
+		function insert_marked(users)
+		{
+			if (typeof(users.length) == "undefined")
 			{
-				insert_user(users[i].value);
+				insert_user(users.value);
+			}
+			else if (users.length > 0)
+			{
+				for (i = 0; i < users.length; i++)
+				{
+					if (users[i].checked)
+					{
+						insert_user(users[i].value);
+					}
+				}
+			}
+
+			self.close();
+		}
+
+		/**
+		* Mark/unmark checklist
+		* id = ID of parent container, name = name prefix, state = state [true/false]
+		*/
+		function marklist(id, name, state)
+		{
+			var parent = document.getElementById(id);
+			if (!parent)
+			{
+				eval('parent = document.' + id);
+			}
+
+			if (!parent)
+			{
+				return;
+			}
+
+			var rb = parent.getElementsByTagName('input');
+			
+			for (var r = 0; r < rb.length; r++)
+			{
+				if (rb[r].name.substr(0, name.length) == name)
+				{
+					rb[r].checked = state;
+				}
 			}
 		}
-	}
-
-	self.close();
-}
-
-//-->
-</script>
+	//-->
+	</script>
 <!-- ENDIF -->
 
 <form method="post" action="{S_MODE_ACTION}" name="search">
diff --git a/phpBB/styles/subSilver/template/overall_header.html b/phpBB/styles/subSilver/template/overall_header.html
index 4fb03306c2..cb7feca620 100644
--- a/phpBB/styles/subSilver/template/overall_header.html
+++ b/phpBB/styles/subSilver/template/overall_header.html
@@ -60,8 +60,10 @@ function find_username()
 	return false;
 }
 
-// Mark/unmark checkboxes
-// id = ID of parent container, name = name prefix, state = state [true/false]
+/**
+* Mark/unmark checklist
+* id = ID of parent container, name = name prefix, state = state [true/false]
+*/
 function marklist(id, name, state)
 {
 	var parent = document.getElementById(id);