diff --git a/phpBB/ucp/usercp_email.php b/phpBB/ucp/usercp_email.php
deleted file mode 100755
index 28245d4b28..0000000000
--- a/phpBB/ucp/usercp_email.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-/***************************************************************************
- *                             usercp_email.php
- *                            -------------------
- *   begin                : Saturday, Feb 13, 2001
- *   copyright            : (C) 2001 The phpBB Group
- *   email                : support@phpbb.com
- *
- *   $Id$
- *
- ***************************************************************************/
-
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- ***************************************************************************/
-
-if ( !defined('IN_PHPBB') )
-{
-	die("Hacking attempt");
-	exit;
-}
-
-//
-// The User Control Panel uses Barts 'neat-o-module' system (tm) system to handle the tabs.
-// This block specifies the tabs and sub tabs for this section.
-//
-if( !empty($setmodules) )
-{
-	$filename = str_replace(".$phpEx", '', basename(__FILE__));
-
-	return;
-}
-//
-// End Modules setup
-//
-
-
-if ( !empty($HTTP_GET_VARS['u']) || !empty($HTTP_POST_VARS['u']) )
-{
-	$user_id = ( !empty($HTTP_GET_VARS['u']) ) ? intval($HTTP_GET_VARS['u']) : intval($HTTP_POST_VARS['u']);
-}
-else
-{
-	message_die(MESSAGE, $lang['No_user_specified']);
-}
-
-if ( $userdata['user_id'] == ANONYMOUS )
-{
-	header('Location: ' . "login.$phpEx$SID&redirect=ucp.$phpEx&mode=email&u=$user_id");
-	exit;
-}
-
-$sql = "SELECT username, user_email, user_viewemail, user_lang
-	FROM " . USERS_TABLE . "
-	WHERE user_id = $user_id";
-$result = $db->sql_query($sql);
-
-if ( $row = $db->sql_fetchrow($result) )
-{
-	$username = $row['username'];
-	$user_email = $row['user_email'];
-	$user_lang = $row['user_lang'];
-
-	if ( $row['user_viewemail'] || $userdata['user_level'] == ADMIN )
-	{
-		if ( time() - $userdata['user_emailtime'] < $config['flood_interval'] )
-		{
-			message_die(MESSAGE, $lang['Flood_email_limit']);
-		}
-
-		if ( isset($HTTP_POST_VARS['submit']) )
-		{
-			$error = FALSE;
-
-			if ( !empty($HTTP_POST_VARS['subject']) )
-			{
-				$subject = trim(stripslashes($HTTP_POST_VARS['subject']));
-			}
-			else
-			{
-				$error = TRUE;
-				$error_msg = ( !empty($error_msg) ) ? $error_msg . '<br />' . $lang['Empty_subject_email'] : $lang['Empty_subject_email'];
-			}
-
-			if ( !empty($HTTP_POST_VARS['message']) )
-			{
-				$message = trim(stripslashes($HTTP_POST_VARS['message']));
-			}
-			else
-			{
-				$error = TRUE;
-				$error_msg = ( !empty($error_msg) ) ? $error_msg . '<br />' . $lang['Empty_message_email'] : $lang['Empty_message_email'];
-			}
-
-			if ( !$error )
-			{
-				$sql = "UPDATE " . USERS_TABLE . "
-					SET user_emailtime = " . time() . "
-					WHERE user_id = " . $userdata['user_id'];
-				$result = $db->sql_query($sql);
-
-				include($phpbb_root_path . 'includes/emailer.'.$phpEx);
-				$emailer = new emailer($config['smtp_delivery']);
-
-				$email_headers = 'From: ' . $userdata['user_email'] . "\n";
-				if ( !empty($HTTP_POST_VARS['cc_email']) )
-				{
-					$email_headers .= "Cc: " . $userdata['user_email'] . "\n";
-				}
-				$email_headers .= 'Return-Path: ' . $userdata['user_email'] . "\n";
-				$email_headers .= 'X-AntiAbuse: Board servername - ' . $server_name . "\n";
-				$email_headers .= 'X-AntiAbuse: User_id - ' . $userdata['user_id'] . "\n";
-				$email_headers .= 'X-AntiAbuse: Username - ' . $userdata['username'] . "\n";
-				$email_headers .= 'X-AntiAbuse: User IP - ' . $user_ip . "\r\n";
-
-				$emailer->use_template('profile_send_email', $user_lang);
-				$emailer->email_address($user_email);
-				$emailer->set_subject($subject);
-				$emailer->extra_headers($email_headers);
-
-				$emailer->assign_vars(array(
-					'SITENAME' => $config['sitename'],
-					'BOARD_EMAIL' => $config['board_email'],
-					'FROM_USERNAME' => $userdata['username'],
-					'TO_USERNAME' => $username,
-					'MESSAGE' => $message)
-				);
-				$emailer->send();
-				$emailer->reset();
-
-				$template->assign_vars(array(
-					'META' => '<meta http-equiv="refresh" content="5;url=' . "index.$phpEx$SID" . '">')
-				);
-
-				$message = $lang['Email_sent'] . '<br /><br />' . sprintf($lang['Click_return_index'],  '<a href="' . append_sid("index.$phpEx") . '">', '</a>');
-
-				message_die(MESSAGE, $message);
-			}
-		}
-
-		include($phpbb_root_path . 'includes/page_header.'.$phpEx);
-
-		$template->set_filenames(array(
-			'body' => 'profile_send_email.html')
-		);
-		make_jumpbox('viewforum.'.$phpEx);
-
-		if ( $error )
-		{
-			$template->set_filenames(array(
-				'reg_header' => 'error_body.html')
-			);
-			$template->assign_vars(array(
-				'ERROR_MESSAGE' => $error_msg)
-			);
-			$template->assign_var_from_handle('ERROR_BOX', 'reg_header');
-		}
-
-		$template->assign_vars(array(
-			'USERNAME' => $username,
-
-			'S_POST_ACTION' => "ucp.$phpEx$SID&amp;mode=email&amp;u=$user_id",
-
-			'L_SEND_EMAIL_MSG' => $lang['Send_email_msg'],
-			'L_RECIPIENT' => $lang['Recipient'],
-			'L_SUBJECT' => $lang['Subject'],
-			'L_MESSAGE_BODY' => $lang['Message_body'],
-			'L_MESSAGE_BODY_DESC' => $lang['Email_message_desc'],
-			'L_EMPTY_SUBJECT_EMAIL' => $lang['Empty_subject_email'],
-			'L_EMPTY_MESSAGE_EMAIL' => $lang['Empty_message_email'],
-			'L_OPTIONS' => $lang['Options'],
-			'L_CC_EMAIL' => $lang['CC_email'],
-			'L_SPELLCHECK' => $lang['Spellcheck'],
-			'L_SEND_EMAIL' => $lang['Send_email'])
-		);
-
-		include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
-	}
-	else
-	{
-		message_die(MESSAGE, $lang['User_prevent_email']);
-	}
-}
-else
-{
-	message_die(MESSAGE, $lang['User_not_exist']);
-}
-
-?>
\ No newline at end of file
diff --git a/phpBB/ucp/usercp_viewprofile.php b/phpBB/ucp/usercp_viewprofile.php
deleted file mode 100755
index 73584596d1..0000000000
--- a/phpBB/ucp/usercp_viewprofile.php
+++ /dev/null
@@ -1,254 +0,0 @@
-<?php
-/***************************************************************************
- *                           usercp_viewprofile.php
- *                            -------------------
- *   begin                : Saturday, Feb 13, 2001
- *   copyright            : (C) 2001 The phpBB Group
- *   email                : support@phpbb.com
- *
- *   $Id$
- *
- *
- ***************************************************************************/
-
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *
- ***************************************************************************/
-
-if ( !defined('IN_PHPBB') )
-{
-	die('Hacking attempt');
-	exit;
-}
-
-//
-// The User Control Panel uses Barts 'neat-o-module' system (tm) system to handle the tabs.
-// This block specifies the tabs and sub tabs for this section.
-//
-if( !empty($setmodules) )
-{
-	$filename = str_replace(".$phpEx", '', basename(__FILE__));
-
-	return;
-}
-//
-// End Modules setup
-//
-
-if ( empty($_GET['u']) || $_GET['u'] == ANONYMOUS )
-{
-	message_die(MESSAGE, $user->lang['No_user_id_specified']);
-}
-$profiledata = get_userdata(intval($_GET['u']));
-
-$sql = "SELECT *
-	FROM " . RANKS_TABLE . "
-	ORDER BY rank_special, rank_min";
-$result = $db->sql_query($sql);
-
-while ( $row = $db->sql_fetchrow($result) )
-{
-	$ranksrow[] = $row;
-}
-$db->sql_freeresult($result);
-
-//
-// Output page header and profile_view template
-//
-$template->set_filenames(array(
-	'body' => 'profile_view_body.html')
-);
-make_jumpbox('viewforum.'.$phpEx);
-
-//
-// Calculate the number of days this user has been a member ($memberdays)
-// Then calculate their posts per day
-//
-$regdate = $profiledata['user_regdate'];
-$memberdays = max(1, round( ( time() - $regdate ) / 86400 ));
-$posts_per_day = $profiledata['user_posts'] / $memberdays;
-
-// Get the users percentage of total posts
-if ( $profiledata['user_posts'] )
-{
-	$sql = "SELECT SUM(forum_posts) AS total
-		FROM " . FORUMS_TABLE;
-	$result = $db->sql_query($sql);
-
-	$total_posts = ($row = $db->sql_fetchrow($result)) ? $row['total'] : 0;
-	$db->sql_freeresult($result);
-
-	$percentage = ( $total_posts ) ? min(100, ($profiledata['user_posts'] / $total_posts) * 100) : 0;
-}
-else
-{
-	$percentage = 0;
-}
-
-$avatar_img = '';
-if ( $profiledata['user_avatar_type'] && $profiledata['user_allowavatar'] )
-{
-	switch( $profiledata['user_avatar_type'] )
-	{
-		case USER_AVATAR_UPLOAD:
-			$avatar_img = ( $config['allow_avatar_upload'] ) ? '<img src="' . $config['avatar_path'] . '/' . $profiledata['user_avatar'] . '" alt="" border="0" />' : '';
-			break;
-		case USER_AVATAR_REMOTE:
-			$avatar_img = ( $config['allow_avatar_remote'] ) ? '<img src="' . $profiledata['user_avatar'] . '" alt="" border="0" />' : '';
-			break;
-		case USER_AVATAR_GALLERY:
-			$avatar_img = ( $config['allow_avatar_local'] ) ? '<img src="' . $config['avatar_gallery_path'] . '/' . $profiledata['user_avatar'] . '" alt="" border="0" />' : '';
-			break;
-	}
-}
-
-$poster_rank = '';
-$rank_image = '';
-if ( $profiledata['user_rank'] )
-{
-	for($i = 0; $i < count($ranksrow); $i++)
-	{
-		if ( $profiledata['user_rank'] == $ranksrow[$i]['rank_id'] && $ranksrow[$i]['rank_special'] )
-		{
-			$poster_rank = $ranksrow[$i]['rank_title'];
-			$rank_image = ( $ranksrow[$i]['rank_image'] ) ? '<img src="' . $ranksrow[$i]['rank_image'] . '" alt="' . $poster_rank . '" title="' . $poster_rank . '" border="0" /><br />' : '';
-		}
-	}
-}
-else
-{
-	for($i = 0; $i < count($ranksrow); $i++)
-	{
-		if ( $profiledata['user_posts'] >= $ranksrow[$i]['rank_min'] && !$ranksrow[$i]['rank_special'] )
-		{
-			$poster_rank = $ranksrow[$i]['rank_title'];
-			$rank_image = ( $ranksrow[$i]['rank_image'] ) ? '<img src="' . $ranksrow[$i]['rank_image'] . '" alt="' . $poster_rank . '" title="' . $poster_rank . '" border="0" /><br />' : '';
-		}
-	}
-}
-
-if ( $profiledata['user_viewemail'] || $auth->acl_get('a_') )
-{
-	$email_uri = ( $config['board_email_form'] ) ? "ucp.$phpEx$SID&amp;mode=email&amp;u=" . $profiledata['user_id'] : 'mailto:' . $profiledata['user_email'];
-
-	$email_img = '<a href="' . $email_uri . '">' . $user->img('icon_email', $user->lang['Send_email']) . '</a>';
-	$email = '<a href="' . $email_uri . '">' . $user->lang['Send_email'] . '</a>';
-}
-else
-{
-	$email_img = '&nbsp;';
-	$email = '&nbsp;';
-}
-
-$temp_url = "ucp.$phpEx$SID&amp;mode=viewprofile&amp;u=$user_id";
-$profile_img = '<a href="' . $temp_url . '">' . $user->img('icon_profile', $user->lang['Read_profile']) . '</a>';
-$profile = '<a href="' . $temp_url . '">' . $user->lang['Read_profile'] . '</a>';
-
-$temp_url = "privmsg.$phpEx$SID&amp;mode=post&amp;u=$user_id";
-$pm_img = '<a href="' . $temp_url . '">' . $user->img('icon_pm', $user->lang['Send_private_message']) . '</a>';
-$pm = '<a href="' . $temp_url . '">' . $user->lang['Send_private_message'] . '</a>';
-
-$www_img = ( $profiledata['user_website'] ) ? '<a href="' . $profiledata['user_website'] . '" target="_userwww">' . $user->img('icon_www', $user->lang['Visit_website']) . '</a>' : '';
-$www = ( $profiledata['user_website'] ) ? '<a href="' . $profiledata['user_website'] . '" target="_userwww">' . $user->lang['Visit_website'] . '</a>' : '';
-
-if ( !empty($profiledata['user_icq']) )
-{
-	$icq_status_img = '<a href="http://wwp.icq.com/' . $profiledata['user_icq'] . '#pager"><img src="http://web.icq.com/whitepages/online?icq=' . $profiledata['user_icq'] . '&img=5" width="18" height="18" border="0" /></a>';
-	$icq_img = '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $profiledata['user_icq'] . '">' . $user->img('icon_icq', $user->lang['ICQ']) . '</a>';
-	$icq =  '<a href="http://wwp.icq.com/scripts/search.dll?to=' . $profiledata['user_icq'] . '">' . $user->lang['ICQ'] . '</a>';
-}
-else
-{
-	$icq_status_img = '';
-	$icq_img = '';
-	$icq = '';
-}
-
-$aim_img = ( $profiledata['user_aim'] ) ? '<a href="aim:goim?screenname=' . $profiledata['user_aim'] . '&amp;message=Hello+Are+you+there?">' . $user->img('icon_aim', $user->lang['AIM']) . '</a>' : '';
-$aim = ( $profiledata['user_aim'] ) ? '<a href="aim:goim?screenname=' . $profiledata['user_aim'] . '&amp;message=Hello+Are+you+there?">' . $user->lang['AIM'] . '</a>' : '';
-
-$temp_url = "ucp.$phpEx$SID&amp;mode=viewprofile&amp;u=$user_id";
-$msn_img = ( $profiledata['user_msnm'] ) ? '<a href="' . $temp_url . '">' . $user->img('icon_msnm', $user->lang['MSNM']) . '</a>' : '';
-$msn = ( $profiledata['user_msnm'] ) ? '<a href="' . $temp_url . '">' . $user->lang['MSNM'] . '</a>' : '';
-
-$yim_img = ( $profiledata['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $profiledata['user_yim'] . '&amp;.src=pg">' . $user->img('icon_yim', $user->lang['YIM']) . '</a>' : '';
-$yim = ( $profiledata['user_yim'] ) ? '<a href="http://edit.yahoo.com/config/send_webmesg?.target=' . $profiledata['user_yim'] . '&amp;.src=pg">' . $user->lang['YIM'] . '</a>' : '';
-
-$temp_url = "search.$phpEx$SID&amp;search_author=" . urlencode($profiledata['username']) . "&amp;showresults=posts";
-$search_img = '<a href="' . $temp_url . '">' . $user->img('icon_search', $user->lang['Search_user_posts']) . '</a>';
-$search = '<a href="' . $temp_url . '">' . $user->lang['Search_user_posts'] . '</a>';
-
-//
-// Generate page
-//
-$page_title = $user->lang['Viewing_profile'];
-include($phpbb_root_path . 'includes/page_header.'.$phpEx);
-
-$template->assign_vars(array(
-	'USERNAME' => $profiledata['username'],
-	'JOINED' => $user->format_date($profiledata['user_regdate'], $user->lang['DATE_FORMAT']),
-	'POSTER_RANK' => $poster_rank,
-	'RANK_IMAGE' => $rank_image,
-	'POSTS_PER_DAY' => $posts_per_day,
-	'POSTS' => $profiledata['user_posts'],
-	'PERCENTAGE' => $percentage . '%',
-	'POST_DAY_STATS' => sprintf($user->lang['User_post_day_stats'], $posts_per_day),
-	'POST_PERCENT_STATS' => sprintf($user->lang['User_post_pct_stats'], $percentage),
-
-	'SEARCH_IMG' => $search_img,
-	'SEARCH' => $search,
-	'PM_IMG' => $pm_img,
-	'PM' => $pm,
-	'EMAIL_IMG' => $email_img,
-	'EMAIL' => $email,
-	'WWW_IMG' => $www_img,
-	'WWW' => $www,
-	'ICQ_STATUS_IMG' => $icq_status_img,
-	'ICQ_IMG' => $icq_img,
-	'ICQ' => $icq,
-	'AIM_IMG' => $aim_img,
-	'AIM' => $aim,
-	'MSN_IMG' => $msn_img,
-	'MSN' => $msn,
-	'YIM_IMG' => $yim_img,
-	'YIM' => $yim,
-
-	'LOCATION' => ( $profiledata['user_from'] ) ? $profiledata['user_from'] : '&nbsp;',
-	'OCCUPATION' => ( $profiledata['user_occ'] ) ? $profiledata['user_occ'] : '&nbsp;',
-	'INTERESTS' => ( $profiledata['user_interests'] ) ? $profiledata['user_interests'] : '&nbsp;',
-	'AVATAR_IMG' => $avatar_img,
-
-	'L_VIEWING_PROFILE' => sprintf($user->lang['Viewing_user_profile'], $profiledata['username']),
-	'L_ABOUT_USER' => sprintf($user->lang['About_user'], $profiledata['username']),
-	'L_AVATAR' => $user->lang['Avatar'],
-	'L_POSTER_RANK' => $user->lang['Poster_rank'],
-	'L_JOINED' => $user->lang['Joined'],
-	'L_TOTAL_POSTS' => $user->lang['Total_posts'],
-	'L_SEARCH_USER_POSTS' => sprintf($user->lang['Search_user_posts'], $profiledata['username']),
-	'L_CONTACT' => $user->lang['Contact'],
-	'L_EMAIL_ADDRESS' => $user->lang['Email_address'],
-	'L_EMAIL' => $user->lang['Email'],
-	'L_PM' => $user->lang['Private_Message'],
-	'L_ICQ_NUMBER' => $user->lang['ICQ'],
-	'L_YAHOO' => $user->lang['YIM'],
-	'L_AIM' => $user->lang['AIM'],
-	'L_MESSENGER' => $user->lang['MSNM'],
-	'L_WEBSITE' => $user->lang['Website'],
-	'L_LOCATION' => $user->lang['Location'],
-	'L_OCCUPATION' => $user->lang['Occupation'],
-	'L_INTERESTS' => $user->lang['Interests'],
-
-	'U_SEARCH_USER' => "search.$phpEx$SID&amp;search_author=" . urlencode($profiledata['username']),
-
-	'S_PROFILE_ACTION' => "ucp.$phpEx$SID")
-);
-
-include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
-
-?>
\ No newline at end of file