diff --git a/.gitattributes b/.gitattributes
index 1524d55c..ddf88b47 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -217,6 +217,7 @@ bureau/admin/images/row-down.png2 -text
 bureau/admin/images/schedule.png -text
 bureau/admin/images/search.png -text
 bureau/admin/images/stat.png -text
+bureau/admin/images/undelete.png -text
 bureau/admin/index.php -text
 bureau/admin/ip_main.php -text
 bureau/admin/js/alternc.js -text
diff --git a/bureau/admin/head.php b/bureau/admin/head.php
index 08333817..7a613b8a 100644
--- a/bureau/admin/head.php
+++ b/bureau/admin/head.php
@@ -1,13 +1,9 @@
 <?php
 /*
- $Id: head.php,v 1.4 2005/05/03 14:36:34 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/
+ Copyright (C) 2000-2012 by the AlternC Development Team.
+ https://alternc.org/
  ----------------------------------------------------------------------
  LICENSE
 
@@ -23,7 +19,6 @@
 
  To read the license please visit http://www.gnu.org/copyleft/gpl.html
  ----------------------------------------------------------------------
- Original Author of file: Benjamin Sonntag
  Purpose of file: Main header of all html files
  ----------------------------------------------------------------------
 */
@@ -31,24 +26,27 @@ if (!$charset) $charset="UTF-8";
 @header("Content-Type: text/html; charset=$charset");
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $lang; ?>" lang="<?php echo $lang; ?>">
 <head>
-<title>Bureau</title>
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
+<title><?php __("AlternC Control Panel"); ?></title>
+
+<link rel="stylesheet" href="js/jquery_ui/css/smoothness/jquery-ui-1.8.23.custom.css" type="text/css" />
 <link rel="stylesheet" href="styles/style.css" type="text/css" />
 <link rel="stylesheet" href="styles/passwordStrengthMeter.css" type="text/css" />
+
 <link rel="Shortcut Icon" href="favicon.ico" type="image/ico" />
 <link rel="icon" href="favicon.ico" type="image/ico" />
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" />
-<script type="text/javascript" src="js/alternc.js"></script>
+
+<script src="js/alternc.js" type="text/javascript" ></script>
 <script src="js/jquery.min.js" type="text/javascript"></script>
 <script src="js/jquery_ui/js/jquery-ui-1.8.23.custom.min.js" type="text/javascript"></script>
+<script src="js/passwordStrengthMeter.js" type="text/javascript"></script>
 <?php
 $lang_date_picker="js/jquery_ui/js/jquery.ui.datepicker-".substr($lang,0,2).".js";
 if (file_exists($lang_date_picker)) 
   echo "<script src=\"$lang_date_picker\" type=\"text/javascript\"></script>";
 ?>
-<link href="js/jquery_ui/css/smoothness/jquery-ui-1.8.23.custom.css" rel="stylesheet" type="text/css" />
-<script src="js/passwordStrengthMeter.js" type="text/javascript"></script>
 </head>
 <body>
 <?
diff --git a/bureau/admin/images/undelete.png b/bureau/admin/images/undelete.png
new file mode 100644
index 00000000..cc58d0fb
Binary files /dev/null and b/bureau/admin/images/undelete.png differ
diff --git a/bureau/admin/mail_doadd.php b/bureau/admin/mail_doadd.php
index 63737ba0..d1c6103a 100644
--- a/bureau/admin/mail_doadd.php
+++ b/bureau/admin/mail_doadd.php
@@ -1,13 +1,9 @@
 <?php
 /*
- $Id: mail_doadd.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/
+ Copyright (C) 2000-2012 by the AlternC Development Team.
+ https://alternc.org/
  ----------------------------------------------------------------------
  LICENSE
 
diff --git a/bureau/admin/mail_list.php b/bureau/admin/mail_list.php
index ab29da93..626aaa23 100644
--- a/bureau/admin/mail_list.php
+++ b/bureau/admin/mail_list.php
@@ -84,7 +84,7 @@ if (empty($mails_list)){ // If there is no mail for this domain
 <span class="int intleft"><img src="/images/search.png" style="vertical-align: middle"/> </span><input type="text" name="search" value="<?php ehe($search); ?>" size="20" maxlength="64" class="int intright" />
 </form>
 </td><td>
-<?php pager($offset,$count,$mail->total,"mail_list.php?domain_id=".$domain_id."&count=".$count."&search=".urlencode($search)."&offset=%%offset%%"); ?>
+<?php pager($offset,$count,$mail->total,"mail_list.php?domain_id=".$domain_id."&amp;count=".$count."&amp;search=".urlencode($search)."&amp;offset=%%offset%%"); ?>
 </td><td style="text-align:right">
 <form method="get" name="" action="mail_list.php">
  <input type="hidden" name="domain_id" value="<?php echo $domain_id; ?>" />
@@ -92,7 +92,6 @@ if (empty($mails_list)){ // If there is no mail for this domain
  <?php __("Items per page:"); ?> <select name="count" class="inl" onchange="submit()"><?php eoption($counts,$count); ?></select>
 </form>
 </td></tr></table>
-</fieldset>
 
 <form method="post" action="mail_del.php">
  <input type="hidden" name="domain_id" value="<?php echo $domain_id; ?>" />
@@ -110,14 +109,14 @@ while (list($key,$val)=each($mails_list)){
 	  <td colspan="3"><?php __("Deleting..."); ?></td>
 	  <?php } else if ($val["mail_action"]=="DELETE") { $grey="grey"; ?>
 	  <td></td>
-	  <td><div class="ina"><a href="mail_undelete.php?search=<?php ehe($search); ?>&offset=<?php ehe($offset); ?>&count=<?php ehe($count); ?>&domain_id=<?php ehe($domain_id);  ?>&mail_id=<?php echo $val["id"] ?>"><img src="images/undelete.png" alt="<?php __("Undelete"); ?>" /><?php __("Undelete"); ?></a></div></td>
+	  <td><div class="ina"><a href="mail_undelete.php?search=<?php ehe($search); ?>&amp;offset=<?php ehe($offset); ?>&amp;count=<?php ehe($count); ?>&amp;domain_id=<?php ehe($domain_id);  ?>&amp;mail_id=<?php echo $val["id"] ?>"><img src="images/undelete.png" alt="<?php __("Undelete"); ?>" /><?php __("Undelete"); ?></a></div></td>
 	  <td><img src="images/check_no.png" alt="<?php __("Disabled"); ?>" /></td>	  
 	  <?php } else if (!$val["type"]) { ?>
           <td align="center">
 	    <input class="inc" type="checkbox" id="del_<?php echo $i; ?>" name="d[]" value="<?php ehe($val["id"]); ?>" />
 	</td>
 	<td class="<?php echo $grey; ?>">
-	  <div class="ina"><a href="mail_properties.php?mail_id=<?php echo $val["id"] ?>"><img src="images/edit.png" alt="<?php __("Edit"); ?>" /><?php __("Edit"); ?></a></div></td>
+	  <div class="ina"><a href="mail_edit.php?mail_id=<?php echo $val["id"] ?>"><img src="images/edit.png" alt="<?php __("Edit"); ?>" /><?php __("Edit"); ?></a></div></td>
 	<td class="<?php echo $grey; ?>"><?php if ($val["enabled"] ) { ?>
 			<img src="images/check_ok.png" alt="<?php __("Enabled"); ?>" />
 		<?php } else { ?>
