1 files changed, 12 insertions, 12 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index fa297d5b89..e635487ff1 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -298,17 +298,17 @@ switch ($mode)
 					$messenger = new messenger(false);
 
 					$messenger->template('profile_send_im', $row['user_lang']);
-					$messenger->subject(html_entity_decode($subject));
+					$messenger->subject(utf8_html_entity_decode($subject));
 
 					$messenger->replyto($user->data['user_email']);
 					$messenger->im($row['user_jabber'], $row['username']);
 
 					$messenger->assign_vars(array(
-						'SITENAME'		=> $config['sitename'],
+						'SITENAME'		=> utf8_html_entity_decode($config['sitename']),
 						'BOARD_EMAIL'	=> $config['board_contact'],
-						'FROM_USERNAME'	=> html_entity_decode($user->data['username']),
-						'TO_USERNAME'	=> html_entity_decode($row['username']),
-						'MESSAGE'		=> html_entity_decode($message))
+						'FROM_USERNAME'	=> utf8_html_entity_decode($user->data['username']),
+						'TO_USERNAME'	=> utf8_html_entity_decode($row['username']),
+						'MESSAGE'		=> utf8_html_entity_decode($message))
 					);
 
 					$messenger->send(NOTIFY_IM);
@@ -728,7 +728,7 @@ switch ($mode)
 
 					if ($user_id)
 					{
-						$messenger->subject(html_entity_decode($subject));
+						$messenger->subject(utf8_html_entity_decode($subject));
 						$messenger->im($row['user_jabber'], $row['username']);
 						$notify_type = $row['user_notify_type'];
 					}
@@ -743,17 +743,17 @@ switch ($mode)
 					$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
 
 					$messenger->assign_vars(array(
-						'SITENAME'		=> $config['sitename'],
+						'SITENAME'		=> utf8_html_entity_decode($config['sitename']),
 						'BOARD_EMAIL'	=> $config['board_contact'],
-						'TO_USERNAME'	=> html_entity_decode($row['to_name']),
-						'FROM_USERNAME'	=> html_entity_decode($user->data['username']),
-						'MESSAGE'		=> html_entity_decode($message))
+						'TO_USERNAME'	=> utf8_html_entity_decode($row['to_name']),
+						'FROM_USERNAME'	=> utf8_html_entity_decode($user->data['username']),
+						'MESSAGE'		=> utf8_html_entity_decode($message))
 					);
 
 					if ($topic_id)
 					{
 						$messenger->assign_vars(array(
-							'TOPIC_NAME'	=> html_entity_decode($row['topic_title']),
+							'TOPIC_NAME'	=> utf8_html_entity_decode($row['topic_title']),
 							'U_TOPIC'		=> generate_board_url() . "/viewtopic.$phpEx?f=" . $row['forum_id'] . "&t=$topic_id")
 						);
 					}
@@ -1111,7 +1111,7 @@ switch ($mode)
 					continue;
 				}
 
-				$params[] = $key . '=' . urlencode(htmlspecialchars($var));
+				$params[] = urlencode($key) . '=' . urlencode(htmlspecialchars($var));
 			}
 		}