diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index 2e4b3ef8f2..34e4147356 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -197,7 +197,7 @@
 		<a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{S_ON_PAGE}</a> &bull; <span>{PAGINATION}</span>
 	</div>
 	<!-- ENDIF -->
-	
+
 	<fieldset class="quick">
 		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
 		<p class="small"><a href="#" onclick="marklist('user_attachments', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('user_attachments', 'mark', false);">{L_UNMARK_ALL}</a></p>
@@ -215,7 +215,7 @@
 	<form id="select_forum" method="post" action="{U_ACTION}">
 
 		<fieldset class="quick" style="text-align: left;">
-			{L_SELECT_FORUM}: <select name="f">{S_FORUM_OPTIONS}</select> 
+			{L_SELECT_FORUM}: <select name="f">{S_FORUM_OPTIONS}</select>
 			<input class="button2" type="submit" value="{L_GO}" name="select" />
 			{S_FORM_TOKEN}
 		</fieldset>
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 2160d712d0..b125a1586a 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -690,7 +690,7 @@ class queue
 		}
 		else
 		{
-			if ($fp = @fopen($this->cache_file, 'w'))
+			if ($fp = @fopen($this->cache_file, 'wb'))
 			{
 				@flock($fp, LOCK_EX);
 				fwrite($fp, "<?php\n\$this->queue_data = unserialize(" . var_export(serialize($this->queue_data), true) . ");\n\n?>");
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index a98a6176ad..b0b7b946be 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -181,7 +181,7 @@ $sql_array = array(
 	'FROM'		=> array(FORUMS_TABLE => 'f'),
 );
 
-// The FROM-Order is quite important here, else t.* columns can not be correctly bound. 
+// The FROM-Order is quite important here, else t.* columns can not be correctly bound.
 if ($post_id)
 {
 	$sql_array['FROM'][POSTS_TABLE] = 'p';