diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 8f0c3e280d..6c20c89459 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -66,6 +66,34 @@ function compose_pm($id, $mode, $action)
 		redirect(append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm'));
 	}
 
+	// Output PM_TO box if message composing
+	if ($action != 'edit')
+	{
+		if ($config['allow_mass_pm'] && $auth->acl_get('u_masspm'))
+		{
+			$sql = 'SELECT group_id, group_name, group_type
+				FROM ' . GROUPS_TABLE . '
+				WHERE group_type NOT IN (' . GROUP_HIDDEN . ', ' . GROUP_CLOSED . ')
+					AND group_receive_pm = 1
+				ORDER BY group_type DESC';
+			$result = $db->sql_query($sql);
+
+			$group_options = '';
+			while ($row = $db->sql_fetchrow($result))
+			{
+				$group_options .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="blue"' : '') . ' value="' . $row['group_id'] . '">' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
+			}
+			$db->sql_freeresult($result);
+		}
+
+		$template->assign_vars(array(
+			'S_SHOW_PM_BOX'		=> true,
+			'S_ALLOW_MASS_PM'	=> ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) ? true : false,
+			'S_GROUP_OPTIONS'	=> ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) ? $group_options : '',
+			'U_SEARCH_USER'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=post&amp;field=username_list'))
+		);
+	}
+
 	$sql = '';
 
 	// What is all this following SQL for? Well, we need to know
diff --git a/phpBB/ucp.php b/phpBB/ucp.php
index 037d577029..f0758e752e 100755
--- a/phpBB/ucp.php
+++ b/phpBB/ucp.php
@@ -283,34 +283,6 @@ while ($row = $db->sql_fetchrow($result))
 }
 $db->sql_freeresult($result);
 
-// Output PM_TO box if message composing
-if ($mode == 'compose' && $auth->acl_get('u_sendpm') && request_var('action', '') != 'edit')
-{
-	if ($config['allow_mass_pm'] && $auth->acl_get('u_masspm'))
-	{
-		$sql = 'SELECT group_id, group_name, group_type
-			FROM ' . GROUPS_TABLE . '
-			WHERE group_type NOT IN (' . GROUP_HIDDEN . ', ' . GROUP_CLOSED . ')
-				AND group_receive_pm = 1
-			ORDER BY group_type DESC';
-		$result = $db->sql_query($sql);
-
-		$group_options = '';
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$group_options .= '<option' . (($row['group_type'] == GROUP_SPECIAL) ? ' class="blue"' : '') . ' value="' . $row['group_id'] . '">' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
-		}
-		$db->sql_freeresult($result);
-	}
-
-	$template->assign_vars(array(
-		'S_SHOW_PM_BOX'		=> true,
-		'S_ALLOW_MASS_PM'	=> ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) ? true : false,
-		'S_GROUP_OPTIONS'	=> ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) ? $group_options : '',
-		'U_SEARCH_USER'		=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&amp;form=post&amp;field=username_list'))
-	);
-}
-
 // Instantiate module system and generate list of available modules
 $module->list_modules('ucp');