diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 1375bcfe4a..c7a8694652 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -241,7 +241,7 @@ p a {
 		<li>[Sec] Changed the embedding of Flash (NeoThermic, DelvarWorld).</li>
 		<li>[Fix] Use the signature setting for PMs (Bug #12001)</li>
 		<li>[Fix] Made the DBMS selection use language variables (Bug #11969)</li>
-
+		<li>[Fix] Make sure that a folder is used when viewing messages to oneself (Bug #12105)</li>
 	</ul>
 
 	</div>
diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php
index 73bb3411cd..88ca6d64f5 100644
--- a/phpBB/includes/ucp/ucp_pm.php
+++ b/phpBB/includes/ucp/ucp_pm.php
@@ -271,7 +271,8 @@ class ucp_pm
 					$sql = 'SELECT folder_id
 						FROM ' . PRIVMSGS_TO_TABLE . "
 						WHERE msg_id = $msg_id
-							AND user_id = " . $user->data['user_id'];
+							AND folder_id <> " . PRIVMSGS_NO_BOX . ' 
+							AND user_id = ' . $user->data['user_id'];
 					$result = $db->sql_query($sql);
 					$row = $db->sql_fetchrow($result);
 					$db->sql_freeresult($result);