diff --git a/.gitattributes b/.gitattributes
index 1e7c7619..5280837c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -283,19 +283,12 @@ bureau/admin/logo2.png -text
 bureau/admin/logs_download.php -text
 bureau/admin/logs_list.php -text
 bureau/admin/mail_add.php -text
-bureau/admin/mail_alias_create.inc.php -text
-bureau/admin/mail_alias_doedit.php -text
 bureau/admin/mail_del.php -text
 bureau/admin/mail_doadd.php -text
 bureau/admin/mail_doedit.php -text
-bureau/admin/mail_edit.inc.php -text
 bureau/admin/mail_edit.php -text
 bureau/admin/mail_list.php -text
-bureau/admin/mail_localbox_doedit.php -text
-bureau/admin/mail_localbox_edit.inc.php -text
 bureau/admin/mail_properties.php -text
-bureau/admin/mail_redirection_doedit.php -text
-bureau/admin/mail_redirection_edit.inc.php -text
 bureau/admin/mail_undelete.php -text
 bureau/admin/main.php -text
 bureau/admin/mem_admin.php -text
diff --git a/bureau/admin/mail_alias_create.inc.php b/bureau/admin/mail_alias_create.inc.php
deleted file mode 100644
index 01286418..00000000
--- a/bureau/admin/mail_alias_create.inc.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php 
-/*
- mail_alias_create.php,v 1.3 2006/01/12 01:10:48 anarcat Exp $
- ----------------------------------------------------------------------
- AlternC - Web Hosting System
- Copyright (C) 2002 by the AlternC Development Team.
- http://alternc.org/
- ----------------------------------------------------------------------
- Based on:
- Valentin Lacambre's web hosting softwares: http://altern.org/
- ----------------------------------------------------------------------
- LICENSE
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License (GPL)
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- To read the license please visit http://www.gnu.org/copyleft/gpl.html
- ----------------------------------------------------------------------
- Original Author of file: Benjamin Sonntag
- Purpose of file: Create a new mail account
- ----------------------------------------------------------------------
-*/
-require_once("../class/config.php");
-
-if (!$details=$mail->mail_get_details($mail_id)) {
-	$error=$err->errstr();
-	echo $error;
-}
-?>
-<?php
-
-if (isset($error) && $error) {
-	echo "<p class=\"error\">$error</p>";
-}
-
-$dom_list = $mail->enum_domains;
-?>
-<form action="mail_alias_doedit.php" method="post" name="mail_create" id="main" onsubmit="return is_valid_mail(document.getElementById('mail_arg').value+document.getElementById('dom_id').options[document.getElementById('dom_id').selectedIndex].text);">
-<table>
-<tr> 
-    <td> 
-      <input type="text" class="inb" name="mail_arg" id="mail_arg" value="" size="20" maxlength="255"  /> 
-    </td> 
-    <td><select name="dom_id" id="dom_id" ><?php foreach($dom_list as $key => $val){ ?><option value="<?php echo urlencode($val['id']) ?>"><?php echo "@".$val["domaine"] ?> </option><?php } ?> </select><td>
-    <td><input type="submit" class="inb" name="submit" value="<?php __("Create this alias"); ?>" /></td>
-</table>
-<input type="hidden" class="inb" name="mail_id" value="<?php echo $mail_id ; ?>" />
-<input type="hidden" class="inb" name="address_full" id="address_full" value="<?php echo $details["address_full"] ; ?>" />
-
-
-</form>
diff --git a/bureau/admin/mail_alias_doedit.php b/bureau/admin/mail_alias_doedit.php
deleted file mode 100644
index 5c835cd0..00000000
--- a/bureau/admin/mail_alias_doedit.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?
-/*
- mail_alias_doedit.php, author: squidly
- ----------------------------------------------------------------------
- AlternC - Web Hosting System
- Copyright (C) 2002 by the AlternC Development Team.
- http://alternc.org/
- ----------------------------------------------------------------------
- Based on:
- Valentin Lacambre's web hosting softwares: http://altern.org/
- ----------------------------------------------------------------------
- LICENSE
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License (GPL)
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- To read the license please visit http://www.gnu.org/copyleft/gpl.html
- ----------------------------------------------------------------------
- Purpose of file: Create a new mail account
- ----------------------------------------------------------------------
-*/
-require_once("../class/config.php");
-$fields = array (
-	"mail_arg" => array ("request", "string",0),
-	"mail_id" => array ("request", "integer",0),
-	"domain" => array ("request", "string",0),
-	"address_full" => array ("request", "string",0),
-	"dom_id" => array ("request", "integer",0),
-	"rcp" =>array("request", "array", "")
-);
-getFields($fields);
-
-$alias_retour=array ();
-$alias_retour=$mail->create($dom_id,$mail_arg);
-//setting up the alias.
-if(!$mail_alias->setalias($alias_retour["mail_id"],$address_full)){
-//if fails redirect to creation with error message.
-$error=sprintf(_("Alias: %s already created"), $mail_arg);
-include("mail_alias_create.inc.php");
-}else{
-//redirection to the properties list.
-header ("Location: mail_properties.php?mail_id=$mail_id");
-}
-
-
-
-
diff --git a/bureau/admin/mail_edit.inc.php b/bureau/admin/mail_edit.inc.php
deleted file mode 100644
index 03ef2d8f..00000000
--- a/bureau/admin/mail_edit.inc.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/*
- ----------------------------------------------------------------------
- AlternC - Web Hosting System
- Copyright (C) 2000-2012 by the AlternC Development Team.
- https://alternc.org/
- ----------------------------------------------------------------------
- LICENSE
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License (GPL)
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- To read the license please visit http://www.gnu.org/copyleft/gpl.html
- ----------------------------------------------------------------------
- Purpose of file: Edit a mailbox.
- ----------------------------------------------------------------------
-*/
-require_once("../class/config.php");
-
-if (!$mail_details=$mail->mail_get_details($mail_id)) {
-	$error=$err->errstr();
-}
-if(isset($error) && $error){
- echo "<p class=\"error\">$error</p><p>&nbsp;</p>";
-}
-
-?>
-<form action="mail_doedit.php" method="post" name="main" id="main">
-<fieldset>
-  <legend><?php __("Status"); ?></legend>
-  <p>
-    <?php __("Is this mail enabled ?<br/><i>Having a mail disabled forbid consultation or reception, but do not remove the mailbox or his configuration.</i>"); ?>
-  </p>
-  <input type="radio" name="enable" id="enable0" class="inc" value="0"<?php cbox($mail_details['enabled']==0); ?> onclick="show('enabletbl');"><label for="enable0"><?php __("Disable"); ?></label>
-   <input type="radio" name="enable" id="enable1" class="inc" value="1"<?php cbox($mail_details['enabled']!=0); ?> onclick="show('enabletbl');"><label for="enable1"><?php __("Enable"); ?></label>
-</fieldset>
-<br/>
-<fieldset><legend><?php __("Password"); ?></legend>
-  <p>
-    <?php __("You need to have a password for some application (example: local mailbox);"); ?>
-  </p>
-  <p>
-<?php
-if($mail_details['password'] == ""){
-	__("Set a passowrd:");?>
-<?php
-}else{
-	__("Change your password:");
-?>
-<?php
-}
-?>
-  </p>
-  <table>
-    <tr>
-      <td><label for="pass"><?php __("Password"); ?></label></td>
-      <td><input type="password" class="int" name="pass" id="pass" value="" size="20" maxlength="32" onKeyUp="javascript:checkpass();" /></td>
-      <td rowspan=2><img src="" id="passimg" alt="" /><br/><label id="passtxt" /></td>
-    </tr>
-      <td><label for="passconf"><?php __("Confirm password"); ?></label></td>
-      <td><input type="password" class="int" name="passconf" id="passconf" value="" size="20" maxlength="32" onKeyUp="javascript:checkpass();" /></td>
-    <tr>
-    </tr>
-  </table>
-</fieldset>
-
-<br/>
-
-<input type="hidden" class="inb" name="is_enabled" value="<?php echo $mail_details['enabled'] ; ?>" />
-<input type="hidden" class="inb" name="mail_id" value="<?php echo $mail_id ; ?>" />
-<input type="hidden" class="inb" name="domain" value="<?php echo $mail_details['domain'] ; ?>" />
-<input type="submit" class="inb" name="submit" value="<?php __("Change this email address"); ?>" />
-<input type="button" class="inb" name="cancel" value="<?php __("Cancel"); ?>" onclick="document.location='mail_properties.php?mail_id=<?php echo urlencode($mail_id); ?>'"/>
-</form>
-
-<script type="text/javascript">
-
-function checkpass() {
-  var pass = document.getElementById('pass').value;
-  var passconf = document.getElementById('passconf').value;
-  var src ="";
-  var alt ="";
-  var txt ="";
-
-  if (pass != passconf ) {
-    src = "images/check_no.png";
-    alt = "KO";
-    txt = '<?php echo htmlentities(_("Password does not match")); ?>';
-  } else {
-    src ="images/check_ok.png";
-    alt ="OK";
-    txt = '<?php echo htmlentities(_("Password match")); ?>';
-  } 
-
-  document.getElementById('passimg').src = src;
-  document.getElementById('passimg').alt = alt;
-  document.getElementById('passtxt').innerHTML = txt;
-}
-</script>
-
-
-
-
-
diff --git a/bureau/admin/mail_localbox_doedit.php b/bureau/admin/mail_localbox_doedit.php
deleted file mode 100644
index 8589f532..00000000
--- a/bureau/admin/mail_localbox_doedit.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?
-/*
- mail_localbox_doedit.php, author: squidly
- ----------------------------------------------------------------------
- AlternC - Web Hosting System
- Copyright (C) 2002 by the AlternC Development Team.
- http://alternc.org/
- ----------------------------------------------------------------------
- Based on:
- Valentin Lacambre's web hosting softwares: http://altern.org/
- ----------------------------------------------------------------------
- LICENSE
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License (GPL)
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- To read the license please visit http://www.gnu.org/copyleft/gpl.html
- ----------------------------------------------------------------------
- Purpose of file: Create a new mail account
- ----------------------------------------------------------------------
-*/
-
-
- require_once("../class/config.php");
-
-
-$fields = array (
-	"local" => array ("request", "integer",0),
-	"mail_id" => array ("request", "integer",0),
-	"is_local" => array ("request", "integer",0)
-);
-getFields($fields);
-/*si local vaut non =
-	si boite pas deja locale : ne rien faire
-	si boite locale: suprimmer entré dans mailbox
-	niveau system virer le dossier.
-  si local vaut oui =
-	si boite pas deja local: ajout entré table mailbox
-	si boite locale: dire a l'utilisateur que c'est deja le cas.
-*/
-print_r($is_local);
-//if we are already processing a localy hosted mail
-if(isset($is_local) && intval($is_local) == 1){
-	//if user chose yes to localbox
-	if($local == 1){
-		$error = _("Already Activated");
-		header ("Location: /mail_properties.php?mail_id=$mail_id");
-	}else{
-		$mail_localbox->unset_localbox($mail_id);
-		header ("Location: /mail_properties.php?mail_id=$mail_id");
-	}
-}elseif( intval($is_local) == 0 ){
-
-	if($local == 0){
-		$error = _("Already disactivated");
-		header ("Location: /mail_properties.php?mail_id=$mail_id");
-	}else{
-		//echo "processing mail to localbox";
-		$mail_localbox->set_localbox($mail_id);
-		header ("Location: /mail_properties.php?mail_id=$mail_id");
-	}
-
-
-
-}
-
-
diff --git a/bureau/admin/mail_localbox_edit.inc.php b/bureau/admin/mail_localbox_edit.inc.php
deleted file mode 100644
index 2806d1e8..00000000
--- a/bureau/admin/mail_localbox_edit.inc.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php 
-/*
- mail_localbox_edit.php, author: squidly
- ----------------------------------------------------------------------
- AlternC - Web Hosting System
- Copyright (C) 2002 by the AlternC Development Team.
- http://alternc.org/
- ----------------------------------------------------------------------
- Based on:
- Valentin Lacambre's web hosting softwares: http://altern.org/
- ----------------------------------------------------------------------
- LICENSE
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License (GPL)
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- To read the license please visit http://www.gnu.org/copyleft/gpl.html
- ----------------------------------------------------------------------
- Purpose of file: Create a new mail account
- ----------------------------------------------------------------------
-*/
-
-require_once("../class/config.php");
-if (! $mail_id ) {
-	$error="Missing mail_id";
-}
-$mail_details = $mail->mail_get_details($mail_id);
-if (!$mail_details) die ("error on mail details");
-
-if (isset($error) && $error) {
-  echo "<p class=\"error\">$error</p><p>&nbsp;</p>";
-}
-
-echo "<h3>";
-echo sprintf(_("Edition of <b>%s</b>")."<br />",$mail_details['address_full']);
-echo "</h3>";?>
-<form action="mail_localbox_doedit.php" method="post" name="main" id="main">
-
-<table class="tedit">
-  <tr>
-    <td>
-	  <?php if ($mail_details['is_local']!=0) { 
-	echo "<div class=\"warningmsg\">"._("WARNING: turning POP/IMAP off will DELETE the stored messages in this email address. This email address will become a simple redirection.")."</div>"; 
-	}else{
-	echo "<div class=\"warningmsg\">"._("Activate the localbox, will allow you to store your mails on this server. \n It is a very conveniant way to check your mails while roaming,
-		thince they can be accesed remotely by POP or IMAP. It consume space on the server so be sure to verify your quota attribution.")."</div>"; 
-	} 
-?>
-	<p>
-	 <input type="radio" name="local" id="local0" class="inc" value="0"<?php cbox($mail_details['is_local']==0); ?> onclick="show('localtbl');"><label for="local0"><?php __("No"); ?></label>
-	 <input type="radio" name="local" id="local1" class="inc" value="1"<?php cbox($mail_details['is_local']!=0); ?> onclick="show('localtbl');"><label for="local1"><?php __("Yes"); ?></label>
-	</p>
-	<br />
-    </td>
-  </tr>
-  <tr class="trbtn">
-    <td colspan="2">
-      <input type="hidden" class="inb" name="mail_id" value="<?php echo $mail_id ; ?>" />
-      <input type="hidden" class="inb" name="is_local" value="<?php if($mail_details['is_local']==0) echo "0"; else echo "1" ; ?>" />
-      <input type="submit" class="inb" name="submit" value="<?php __("Change this email address"); ?>" />
-      <input type="button" class="inb" name="cancel" value="<?php __("Cancel"); ?>" onclick="document.location='mail_properties.php?mail_id=<?php echo urlencode($mail_id); ?>'"/>
-    </td>
-  </tr>
-</table>
-
-</form>
diff --git a/bureau/admin/mail_redirection_doedit.php b/bureau/admin/mail_redirection_doedit.php
deleted file mode 100644
index e37ca9d7..00000000
--- a/bureau/admin/mail_redirection_doedit.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?
-/*
- mail_redirection_doedit.php, author: squidly
- ----------------------------------------------------------------------
- AlternC - Web Hosting System
- Copyright (C) 2002 by the AlternC Development Team.
- http://alternc.org/
- ----------------------------------------------------------------------
- Based on:
- Valentin Lacambre's web hosting softwares: http://altern.org/
- ----------------------------------------------------------------------
- LICENSE
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License (GPL)
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- To read the license please visit http://www.gnu.org/copyleft/gpl.html
- ----------------------------------------------------------------------
- Purpose of file: Create a new mail account
- ----------------------------------------------------------------------
-*/
-
-require_once("../class/config.php");
-$fields = array (
-	"alias" => array ("request", "string",0),
-	"mail_id" => array ("request", "integer",0),
-	"domain" => array ("request", "string",0),
-	"address_full" => array ("request", "string",0),
-	"dom_id" => array ("request", "integer",0),
-	"rcp" =>array("request", "array", "")
-);
-getFields($fields);
-//obon on crée les redirect..
-$tst=$mail_redirection->setredirection($mail_id, $rcp);
-if($tst==false){
-	$error="One ore more redirection could not be added";
-}
-
-
-
-//redirection si tout se passe bien.
-header ("Location: mail_properties.php?mail_id=$mail_id"); 
-
-?>
diff --git a/bureau/admin/mail_redirection_edit.inc.php b/bureau/admin/mail_redirection_edit.inc.php
deleted file mode 100644
index 47d2fe2f..00000000
--- a/bureau/admin/mail_redirection_edit.inc.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php 
-
-/*
- mail_redirection_edit.php, author: squidly
- ----------------------------------------------------------------------
- AlternC - Web Hosting System
- Copyright (C) 2002 by the AlternC Development Team.
- http://alternc.org/
- ----------------------------------------------------------------------
- Based on:
- Valentin Lacambre's web hosting softwares: http://altern.org/
- ----------------------------------------------------------------------
- LICENSE
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License (GPL)
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- To read the license please visit http://www.gnu.org/copyleft/gpl.html
- ----------------------------------------------------------------------
- Purpose of file: Create a new mail account
- ----------------------------------------------------------------------
-*/
-
-
-require_once("../class/config.php");
-?>
-
-<form action="mail_redirection_doedit.php" method="post" name="main" id="main">
-<table>
-<?php
-if (!isset($mail_id) || is_null($mail_id)) { // if no mail_id
-  die('missing mail id ERROR');
-}
-
-$lst_rcp=$mail_redirection->recipients_get_array($mail_id) ;
-$nb_rcp=count($lst_rcp);
-for ($ii=0;$ii <= count($lst_rcp)+10; $ii++) { 
-  ?>
-  <tr>
-    <td>
-      <input type="text" class="int" name="rcp[<?php echo $ii?>]" id="rcp-<?php echo $ii?>" value="<?php 
-	if (isset($lst_rcp[$ii])){ ehe($lst_rcp[$ii]);} ?>" size="20" maxlength="255" onKeyUp="javascript:check_mail_form_validity(<?php echo $ii; ?>);" />
-    </td>
-    <td><img id="valid-rcp-<?php echo $ii?>" alt="" src="" ></td>
-    <td><a href="#" onclick="javascript:delete_one_recipients(<?php echo $ii?>);" ><?php __("Delete");?></a></td>
-  </tr>
-<?php
-}  // foreach ?>
-  <tr>
-    <td colspan=3 align="right">
-      <input type="button" class="inb" name="clear" value="<?php __("Clear all redirections"); ?>" onclick="javascript:delete_all_recipients();"/>
-    </td>
-  </tr>
-  <tr>
-    <td colspan=3>
-<input type="hidden" class="inb" name="mail_id" value="<?php echo $mail_id ; ?>" />
-      <input type="submit" class="inb" name="submit" value="<?php __("Change this email address"); ?>" />
-      <input type="button" class="inb" name="cancel" value="<?php __("Cancel"); ?>" onclick="document.location='mail_properties.php?mail_id=<?php echo urlencode($mail_id); ?>'"/>
-    </td>
-  </tr>
-</table>
-<script type="text/javascript">
-
-function delete_one_recipients(idelem) {
-  document.getElementById('rcp-'+idelem).value='';
-  check_mail_form_validity(idelem);
-}
-
-function delete_all_recipients() {
-  var answer = confirm ("<?php __("Are you sure you want to clear all redirections?");?>");
-  if (answer) {
-    <?php for ($ii=0;$ii <= count($lst_rcp)+10; $ii++) { ?>
-    delete_one_recipients(<?php echo $ii;?>);
-    <?php } // for ?>
-  }
-}
-
-
-
-<?php for ($ii=0;$ii <= count($lst_rcp)+10; $ii++) { ?>
-check_mail_form_validity(<?php echo $ii;?>);
-<?php } // for ?>
-
-
-</script>
-</form>