diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 93c47b0477..ca2ac55ecb 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -88,8 +88,10 @@
 	<a name="v305"></a><h3>1.i. Changes since 3.0.5</h3>
 
 	<ul>
+		<li>[Fix] Allow whitespaces in avatar gallery names. (Bug #44955)</li>
+		<li>[Fix] Sorting by author or subject on viewtopic now preserves the order. (Bug #44875)</li>
 		<li>[Fix] Correctly determine writable status of files on Windows operating system. (Bug #39035)</li>
-		<li>[Feature] Backported 3.2 cpatcha plugins.</li>
+		<li>[Feature] Backported 3.2 captcha plugins.</li>
 		<li>[Feature] Introduced new ACM plugins: null</li>
 	</ul>
 	<a name="v304"></a><h3>1.ii. Changes since 3.0.4</h3>
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 027db39751..ee9867b1f1 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -2077,8 +2077,8 @@ function avatar_gallery($category, $avatar_select, $items_per_column, $block_var
 						if (preg_match('#^[^&\'"<>]+\.(?:gif|png|jpe?g)$#i', $sub_file))
 						{
 							$avatar_list[$file][$avatar_row_count][$avatar_col_count] = array(
-								'file'		=> "$file/$sub_file",
-								'filename'	=> $sub_file,
+								'file'		=> rawurlencode  ($file) . '/' . rawurlencode  ($sub_file),
+								'filename'	=> rawurlencode  ($sub_file),
 								'name'		=> ucfirst(str_replace('_', ' ', preg_replace('#^(.*)\..*$#', '\1', $sub_file))),
 							);
 							$avatar_col_count++;