diff --git a/bureau/admin/bro_main.php b/bureau/admin/bro_main.php
index 20dc7f06..18881eb2 100644
--- a/bureau/admin/bro_main.php
+++ b/bureau/admin/bro_main.php
@@ -551,10 +551,18 @@ else {
      <?php
 
      if ($id=$ftp->is_ftp($R)) {
-echo _("There is an ftp account in this folder")." <a href=\"ftp_edit.php?id=".urlencode($id)."\">"._("Click here to edit this ftp account.")."</a><br />";
+?>
+<span class="ina">
+	 <a href="ftp_edit.php?id=<?php ehe($id); ?>"><?php __("Edit the ftp account."); ?></a> 
+</span> &nbsp; <?php __("that exists in this folder"); ?>
+<?php
 }
 else {
-echo "<a href=\"ftp_add.php?dir=".urlencode($R)."\">"._("Click here to create an ftp account in this folder.")."</a><br />";
+?>
+<span class="ina">
+    <a href="ftp_add.php?dir=<?php ehe($R); ?>"><?php __("Create an ftp account in this folder"); ?></a>
+</span> &nbsp;
+<?php
 }
 
 ?>
diff --git a/bureau/admin/dom_edit.php b/bureau/admin/dom_edit.php
index 8e905bd7..40a4de8e 100644
--- a/bureau/admin/dom_edit.php
+++ b/bureau/admin/dom_edit.php
@@ -128,7 +128,7 @@ for($i=0;$i<$r["nsub"];$i++) {
 				<label for="webmail"><?php __("Webmail access"); ?></label></td>
 			<td>&nbsp;</td>
 		</tr>
-		<tr style="text-align: right">
+		<tr class="trbtn">
 			<td colspan="2"><input type="submit" class="inb" name="add" value="<?php __("Add this subdomain"); ?>" /></td>
 		</tr>
 	</table>
@@ -165,7 +165,7 @@ if (!$r[noerase]) {
 	<select class="inl" id="email" name="email" <?php if ($r["dns"]) echo "disabled=\"disabled\""; ?>><option value="1"<?php if ($r["mail"]) echo " selected=\"selected\"";?>><?php __("Yes"); ?></option><option value="0"<?php if (!$r["mail"]) echo " selected=\"selected\"";?>><?php __("No"); ?></option></select>
 	</td>
 </tr>
-<tr><td colspan="2" align="center"><input type="submit" class="inb" name="submit" value="<?php __("Submit the changes"); ?>" /></td></tr>
+<tr class="trbtn"><td colspan="2"><input type="submit" class="inb" name="submit" value="<?php __("Submit the changes"); ?>" /></td></tr>
 </table>
 	</form>
 
diff --git a/bureau/admin/dom_subedit.php b/bureau/admin/dom_subedit.php
index 09024db9..7e6f90e7 100644
--- a/bureau/admin/dom_subedit.php
+++ b/bureau/admin/dom_subedit.php
@@ -88,9 +88,14 @@ $dom->unlock();
 			<label for="webmail"><?php __("Webmail access"); ?></label></td>
 		<td>&nbsp;</td>
 	</tr>
+	<tr class="trbtn">
+            <td colspan="2">
+              <input type="submit" class="inb" name="submit" value="<?php __("Validate this change"); ?>" />
+              <input type="button" class="inb" name="back" value="<?php __("Cancel"); ?>" onclick="history.back();" />
+            </td>
+        </tr>
+
 	</table>
-<br />
-<input type="submit" class="inb" name="submit" value="<?php __("Validate this change"); ?>" />
-<input type="button" class="inb" name="back" value="<?php __("Cancel"); ?>" onclick="history.back();" />
+
 </form>
 <?php include_once("foot.php"); ?>
diff --git a/bureau/admin/ftp_add.php b/bureau/admin/ftp_add.php
index 237de3ec..32c59ff5 100644
--- a/bureau/admin/ftp_add.php
+++ b/bureau/admin/ftp_add.php
@@ -52,20 +52,24 @@ if (!$quota->cancreate("ftp")) {
 <label for="login"><?php __("Username"); ?></label></th><td>
 	<select class="inl" name="prefixe"><?php $ftp->select_prefix_list($prefixe); ?></select>&nbsp;<b>_</b>&nbsp;<input type="text" class="int" name="login" id="login" value="<?php echo $login; ?>" size="20" maxlength="64" />
 </td></tr>
-<tr><th><label for="pass"><?php __("Password"); ?></label></th><td><input type="password" class="int" name="pass" id="pass" value="<?php echo $pass; ?>" size="20" maxlength="64" /></td></tr>
-<tr><th><label for="passconf"><?php __("Confirm password"); ?></label></th><td><input type="password" class="int" name="passconf" id="passconf" value="<?php echo $passconf; ?>" size="20" maxlength="64" /></td></tr>
 <tr><th><label for="dir"><?php __("Folder"); ?></label></th><td><input type="text" class="int" name="dir" id="dir" value="<?php echo $dir; ?>" size="20" maxlength="255" />
 <script type="text/javascript">
 <!--
-  document.write("&nbsp;<input type=\"button\" name=\"bff\" onclick=\"browseforfolder('main.dir');\" value=\" ... \" class=\"inb\">");
+  document.write("&nbsp;<input type=\"button\" name=\"bff\" onclick=\"browseforfolder('main.dir');\" value=\" <?php __("Choose a folder..."); ?> \" class=\"bff\">");
 //  -->
 </script>
 </td></tr>
-<tr><td colspan="2"><input type="submit" class="inb" name="submit" value="<?php __("Create this new FTP account."); ?>" /></td></tr>
+<tr><th><label for="pass"><?php __("Password"); ?></label></th><td><input type="password" class="int" name="pass" id="pass" value="<?php echo $pass; ?>" size="20" maxlength="64" /></td></tr>
+<tr><th><label for="passconf"><?php __("Confirm password"); ?></label></th><td><input type="password" class="int" name="passconf" id="passconf" value="<?php echo $passconf; ?>" size="20" maxlength="64" /></td></tr>
+<tr class="trbtn"><td colspan="2">
+  <input type="submit" class="inb" name="submit" value="<?php __("Create this new FTP account."); ?>" />
+  <input type="button" class="inb" name="cancel" value="<?php __("Cancel"); ?>" onclick="document.location='ftp_list.php'"/>
+</td></tr>
 </table>
 </form>
 <?php $mem->show_help("ftp_add"); ?>
 <script type="text/javascript">
 document.forms['main'].login.focus();
+document.forms['main'].setAttribute('autocomplete', 'off');
 </script>
 <?php include_once("foot.php"); ?>
diff --git a/bureau/admin/ftp_doedit.php b/bureau/admin/ftp_doedit.php
index dc34f249..ad9ae4b5 100644
--- a/bureau/admin/ftp_doedit.php
+++ b/bureau/admin/ftp_doedit.php
@@ -38,7 +38,7 @@ if (!$id) {
         	exit();
 	}
 
-	$r=$ftp->put_ftp_details($id,$prefixe,$login,$pass,$rep);
+	$r=$ftp->put_ftp_details($id,$prefixe,$login,$pass,$dir);
 	if (!$r) {
 		$error=$err->errstr();
 		include("ftp_edit.php");
diff --git a/bureau/admin/ftp_edit.php b/bureau/admin/ftp_edit.php
index 20623ccd..9f01d021 100644
--- a/bureau/admin/ftp_edit.php
+++ b/bureau/admin/ftp_edit.php
@@ -59,21 +59,25 @@ if (!$id) {
 <label for="login"><?php __("Username"); ?></label></th><td>
 	<select class="inl" name="prefixe"><?php $ftp->select_prefix_list($r["prefixe"]); ?></select>&nbsp;<b>_</b>&nbsp;<input type="text" class="int" name="login" id="login" value="<?php echo $r["login"]; ?>" size="20" maxlength="64" />
 </td></tr>
-<tr><th><label for="pass"><?php __("Password"); ?></label></th><td><input type="password" class="int" name="pass" id="pass" size="20" maxlength="64" value="********"/></td></tr>
-<tr><th><label for="passconf"><?php __("Confirm password"); ?></label></th><td><input type="password" class="int" name="passconf" id="passconf" size="20" maxlength="64" value="********"/></td></tr>
-<tr><th><label for="rep"><?php __("Folder"); ?></label></th><td><input type="text" class="int" name="rep" id="rep" value="<?php echo $r["dir"]; ?>" size="20" maxlength="64" />
+<tr><th><label for="dir"><?php __("Folder"); ?></label></th><td><input type="text" class="int" name="dir" id="dir" value="<?php echo $r["dir"]; ?>" size="20" maxlength="64" />
 
 <script type="text/javascript">
 <!--
-  document.write("&nbsp;<input type=\"button\" name=\"bff\" onclick=\"browseforfolder('main.rep');\" value=\" ... \" class=\"inb\">");
+  document.write("&nbsp;<input type=\"button\" name=\"bff\" onclick=\"browseforfolder('main.dir');\" value=\" <?php __("Choose a folder..."); ?> \" class=\"bff\">");
 //  -->
 </script>
 </td></tr>
+<tr><th><label for="pass"><?php __("Password"); ?></label></th><td><input type="password" class="int" name="pass" id="pass" size="20" maxlength="64" value=""/></td></tr>
+<tr><th><label for="passconf"><?php __("Confirm password"); ?></label></th><td><input type="password" class="int" name="passconf" id="passconf" size="20" maxlength="64" value=""/></td></tr>
 
-<tr><td colspan="2"><input type="submit" class="inb" name="submit" value="<?php __("Change this FTP account"); ?>" /></td></tr>
+<tr class="trbtn"><td colspan="2">
+  <input type="submit" class="inb" name="submit" value="<?php __("Change this FTP account"); ?>" />
+  <input type="button" class="inb" name="cancel" value="<?php __("Cancel"); ?>" onclick="document.location='ftp_list.php'"/>
+</td></tr>
 </table>
 </form>
 <script type="text/javascript">
 document.forms['main'].login.focus();
+document.forms['main'].setAttribute('autocomplete', 'off'); 
 </script>
 <?php include_once("foot.php"); ?>
diff --git a/bureau/admin/ftp_list.php b/bureau/admin/ftp_list.php
index 6e8d0686..9647327f 100644
--- a/bureau/admin/ftp_list.php
+++ b/bureau/admin/ftp_list.php
@@ -43,24 +43,31 @@ if (!$r=$ftp->get_list($domain)) {
 
 ?>
 <h3><?php __("FTP accounts list"); ?></h3>
+ 
 <?php
-	if ($noftp) {
-?>
-	<p class="error"><?php echo $error ?></p>
-	<a href="ftp_add.php"><?php __("Create a new ftp account") ?></a><br />
-	<?php $mem->show_help("ftp_list_no"); ?>
-<?php
-		include_once("foot.php");
-		exit();
-	}
-
-if ($error) {
+if ($error && !$noftp) {
 ?>
 <p class="error"><?php echo $error ?></p>
 <?php } ?>
+
+<?php if ($quota->cancreate("ftp")) { ?>
+<p>
+   <span class="inb"><a href="ftp_add.php"><?php __("Create a new ftp account"); ?></a></span> 
+</p>
+<?php  	} ?>
+
+<?php
+	if ($noftp) {
+?>
+	<?php $mem->show_help("ftp_list_no"); ?>
+<?php
+ include_once("foot.php"); 
+    } 
+?>
+
 <form method="post" action="ftp_del.php">
-<table cellspacing="0" cellpadding="4">
-<tr><th colspan="2">&nbsp;</th><th><?php __("Username"); ?></th><th><?php __("Folder"); ?></th></tr>
+<table class="tlist">
+  <tr><th colspan="2"><?php __("Actions"); ?></th><th><?php __("Username"); ?></th><th><?php __("Folder"); ?></th></tr>
 <?php
 reset($r);
 $col=1;
@@ -70,7 +77,8 @@ while (list($key,$val)=each($r))
 ?>
 	<tr class="lst<?php echo $col; ?>">
 		<td align="center"><input type="checkbox" class="inc" id="del_<?php echo $val["id"]; ?>" name="del_<?php echo $val["id"]; ?>" value="<?php echo $val["id"]; ?>" /></td>
-		<td class="center"><a href="ftp_edit.php?id=<?php echo $val["id"] ?>"><img src="images/edit.png" alt="<?php __("Edit"); ?>" /></a></td>
+<td><div class="ina"><a href="ftp_edit.php?id=<?php echo $val["id"] ?>"><img src="images/edit.png" alt="<?php __("Edit"); ?>" /><?php __("Edit"); ?></a></div></td>
+
 		<td><label for="del_<?php echo $val["id"]; ?>"><?php echo $val["login"] ?></label></td>
 		<td><code>/<?php echo $val["dir"] ?></code></td>
 	</tr>
@@ -81,12 +89,7 @@ while (list($key,$val)=each($r))
 </table>
 </form>
 
-<?php if ($quota->cancreate("ftp")) { ?>
-<p>
-<a href="ftp_add.php"><?php __("Create a new ftp account"); ?></a>
-</p>
-<?php  	}
-
+<?php
 $mem->show_help("ftp_list");
 ?>
 <?php include_once("foot.php"); ?>
diff --git a/bureau/admin/mail_add.php b/bureau/admin/mail_add.php
index 38717659..2556863f 100644
--- a/bureau/admin/mail_add.php
+++ b/bureau/admin/mail_add.php
@@ -34,32 +34,53 @@ include_once("head.php");
 $fields = array (
 	"domain"    => array ("request", "string", ""),
 	"many"      => array ("request", "integer", 0),
+	"pop"     => array ("request", "integer", 1),
 );
 getFields($fields);
 
 ?>
-<h3><?php printf(_("Add a mail to the domain %s"),"http://$domain"); ?> : </h3>
+<h3><?php printf(_("Add a mail to the domain %s"),$domain); ?> : </h3>
 <?php
 if ($error) {
   echo "<p class=\"error\">$error</p>";
 }
 
 ?>
-<form action="mail_doadd.php" name="main" id="main" method="post">
-<table border="1" cellspacing="0" cellpadding="4">
-	<tr><td><input type="hidden" name="domain" value="<?php echo $domain ?>" />
-<label for="email"><?php __("Email address"); ?></label></td><td><input class="int" type="text" name="email" id="email" value="<?php echo $email ?>" size="20" maxlength="32" />@<?php echo $domain ?></td></tr>
-	<tr><td><label for="ispop"><?php __("Is it a POP/IMAP account?"); ?></label></td><td><input id="ispop" class="inc" type="checkbox" name="pop" value="1" <?php if ($pop=="1") echo "checked=\"checked\""; ?> /></td></tr>
-	<tr><td><label for="pass"><?php __("POP password"); ?></label></td><td><input class="int" type="password" name="pass" id="pass" value="<?php echo $pass; ?>" size="20" maxlength="32" /></td></tr>
-	<tr><td><label for="passconf"><?php __("Confirm password"); ?></label></td><td><input class="int" type="password" name="passconf" id="passconf" value="<?php echo $pass; ?>" size="20" maxlength="32" /></td></tr>
-	<tr><td><label for="alias"><?php __("Other recipients"); ?></label></td><td>(<?php __("One email per line"); ?>)<br /><textarea class="int" cols="32" rows="5" name="alias" id="alias"><?php echo $alias; ?></textarea></td></tr>
-	<tr><td colspan="2"><input type="hidden" name="many" value="<?php echo intval($many); ?>" /><input type="submit" class="inb" name="submit" value="<?php __("Create this mailbox"); ?>" /></td></tr>
+
+<form action="mail_doadd.php" method="post" name="main" id="main">
+  <input type="hidden" name="domain" value="<?php echo $domain; ?>" />
+ <table class="tedit">
+<tr><td>
+  <label for="email"><?php __("Email address"); ?></label></td><td><input class="int" type="text" name="email" id="email" value="<?php ehe($email); ?>" size="20" maxlength="32" /><span class="int" id="emaildom">@ <?php echo $domain ?></span>
+  </td></tr>
+ <tr><td><label for="pop"><?php __("Is it a POP/IMAP account?"); ?></label></td>
+<td>
+<p>
+ <input type="radio" name="pop" id="pop0" class="inc" value="0"<?php checked($pop==0); ?> onclick="hide('poptbl');"><label for="pop0"><?php __("No"); ?></label>
+ <input type="radio" name="pop" id="pop1" class="inc" value="1"<?php checked($pop==1); ?> onclick="show('poptbl');"><label for="pop1"><?php __("Yes"); ?></label>
+</p>
+<div id="poptbl">
+<table class="tedit" >
+	<tr><td><label for="pass"><?php __("POP/IMAP password"); ?></label></td><td><input type="password" class="int" name="pass" id="pass" value="<?php ehe($pass); ?>" size="20" maxlength="32" /></td></tr>
+	<tr><td><label for="passconf"><?php __("Confirm password"); ?></label></td><td><input type="password" class="int" name="passconf" id="passconf" value="<?php echo $pass; ?>" size="20" maxlength="32" /></td></tr>
+</table>
+</div>
+</td></tr>
+
+    <tr><td><label for="alias"><?php __("Redirections<br />Other recipients:"); ?></label></td><td>(<?php __("one email per line"); ?>)<br /><textarea class="int" cols="32" rows="5" name="alias" id="alias"><?php echo $alias; ?></textarea></td></tr>
+<tr class="trbtn"><td colspan="2">
+<input type="hidden" name="many" value="<?php echo intval($many); ?>" />
+  <input type="submit" class="inb" name="submit" value="<?php __("Create this email address"); ?>" />
+  <input type="button" class="inb" name="cancel" value="<?php __("Cancel"); ?>" onclick="document.location='mail_list.php?domain=<?php echo urlencode($domain); ?>'"/>
+</td></tr>
 </table>
 </form>
+
 <p><small>
 <?php __("help_mail_add"); ?>
 </small></p>
 <script type="text/javascript">
 document.forms['main'].email.focus();
+document.forms['main'].setAttribute('autocomplete', 'off');
 </script>
 <?php include_once("foot.php");
diff --git a/bureau/admin/mail_del.php b/bureau/admin/mail_del.php
index b43fab5d..50380c6c 100644
--- a/bureau/admin/mail_del.php
+++ b/bureau/admin/mail_del.php
@@ -48,9 +48,9 @@ if ($confirm=="y") {
 
 while (list($key,$val)=each($d)) {
 	if (!$mail->del_mail($val)) {
-		$error.=sprintf(_("The mailbox <b>%s</b> does not exist!")."<br />",$val);
+		$error.=sprintf(_("The email address <b>%s</b> does not exist!")."<br />",$val);
 	} else {
-		$error.=sprintf(_("The mailbox <b>%s</b> has been deleted!")."<br />",$val); 
+		$error.=sprintf(_("The email address <b>%s</b> has been deleted!")."<br />",$val); 
 	}
 }
 include("mail_list.php");
@@ -76,10 +76,11 @@ while (list($key,$val)=each($d)) {
 
 ?>
 </p>
-<p><input type="submit" class="inb" name="submit" value="<?php __("Delete the selected mailboxes"); ?>" /> - <input type="button" name="cancel" id="cancel" onclick="window.history.go(-1);" class="inb" value="<?php __("Don't delete accounts and go back to the mail list"); ?>"/>
+<p>
+<input type="submit" class="inb" name="submit" value="<?php __("Confirm the deletion"); ?>" /> - <input type="button" name="cancel" id="cancel" onclick="window.history.go(-1);" class="inb" value="<?php __("Don't delete anything and go back to the email list"); ?>"/>
 </p>
 
-<p>
+<p class="warningmsg">
 <?php __("Warning: Deleting an email address will destroy all the messages it contains! You will <b>NOT</b> be able to get it back!"); ?>
 </p>
 
diff --git a/bureau/admin/mail_doadd.php b/bureau/admin/mail_doadd.php
index 62710854..c04d977f 100644
--- a/bureau/admin/mail_doadd.php
+++ b/bureau/admin/mail_doadd.php
@@ -41,7 +41,7 @@ if (!$mail->add_mail($domain,$email,$pop,$pass,$alias)) {
 	include ("mail_add.php");
 } else {
 	$addok=1;
-	$error=sprintf (_("The mailbox <b>%s</b> has been successfully created"),"$email@$domain");
+	$error=sprintf (_("The email address <b>%s</b> has been successfully created"),"$email@$domain");
 	if ($many) {
 		unset($email,$pass,$alias);
 		include("mail_add.php");
diff --git a/bureau/admin/mail_doedit.php b/bureau/admin/mail_doedit.php
index 0b43afd8..04ed6920 100644
--- a/bureau/admin/mail_doedit.php
+++ b/bureau/admin/mail_doedit.php
@@ -43,7 +43,7 @@ if (!$mail->put_mail_details($email,$pop,$pass,$alias)) {
 		include ("mail_edit.php");
 
 } else {
-            $ok=sprintf(_("The mailbox <b>%s</b> has been successfully changed"),$email)."<br />";
+            $ok=sprintf(_("The email address <b>%s</b> has been successfully changed"),$email)."<br />";
             $addok=1;
             $t=explode("@",$email);
             $email=$t[0];
diff --git a/bureau/admin/mail_edit.php b/bureau/admin/mail_edit.php
index 28d06658..d7873437 100644
--- a/bureau/admin/mail_edit.php
+++ b/bureau/admin/mail_edit.php
@@ -45,7 +45,7 @@ else
 {
 
 ?>
-<h3><?php printf(_("Edit an email address of the domain %s"),"http://$domain"); ?> : </h3>
+<h3><?php printf(_("Edit an email address of the domain %s"),$domain); ?> : </h3>
 <?php
 if ($error_edit) {
 	echo "<p class=\"error\">$error_edit</p>";
@@ -62,28 +62,32 @@ if ($error_edit) {
 	<tr><th colspan="2"><input type="hidden" name="email" value="<?php echo $email; ?>" />
 <input type="hidden" name="domain" value="<?php echo $domain; ?>" />
 <?php printf(_("Edit the email address <b>%s</b>"),$email); ?></th></tr>
-								  <tr><td><label for="ispop"><?php __("Is it a POP/IMAP account?"); ?></label></td>
+								  <tr><td><label for="pop"><?php __("Is it a POP/IMAP account?"); ?></label></td>
 <td>
 <p>
- <input type="radio" name="ispop" id="ispop0" class="inc" value="0"<?php checked($pop==0); ?> onclick="hide('ispoptbl');"><label for="ispop0"><?php __("No"); ?></label>
- <input type="radio" name="ispop" id="ispop1" class="inc" value="1"<?php checked($pop==1); ?> onclick="show('ispoptbl');"><label for="ispop1"><?php __("Yes"); ?></label>
+ <input type="radio" name="pop" id="pop0" class="inc" value="0"<?php checked($pop==0); ?> onclick="hide('poptbl');"><label for="pop0"><?php __("No"); ?></label>
+ <input type="radio" name="pop" id="pop1" class="inc" value="1"<?php checked($pop==1); ?> onclick="show('poptbl');"><label for="pop1"><?php __("Yes"); ?></label>
 </p>
-<div id="ispoptbl">
+<div id="poptbl">
 <table class="tedit" >
 	<tr><td><label for="pass"><?php __("POP/IMAP password"); ?></label></td><td><input type="password" class="int" name="pass" id="pass" value="<?php ehe($pass); ?>" size="20" maxlength="32" /></td></tr>
 	<tr><td><label for="passconf"><?php __("Confirm password"); ?></label></td><td><input type="password" class="int" name="passconf" id="passconf" value="<?php echo $pass; ?>" size="20" maxlength="32" /></td></tr>
 </table>
 </div>
- <?php if ($pop) { echo  "<br />"; __("WARNING: turning POP/IMAP off will DELETE the stored messages in this email address. This email address will become a simple redirection."); }?>
-
+<br />
+  <?php if ($pop==1) { 
+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>"; 
+} ?>
 </td></tr>
 
     <tr><td><label for="alias"><?php __("Redirections<br />Other recipients:"); ?></label></td><td>(<?php __("one email per line"); ?>)<br /><textarea class="int" cols="32" rows="5" name="alias" id="alias"><?php echo $alias; ?></textarea></td></tr>
+<tr class="trbtn"><td colspan="2">
+  <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_list.php?domain=<?php echo urlencode($domain); ?>'"/>
+</td></tr>
 </table>
-<br />
-<input type="submit" class="inb" name="submit" value="<?php __("Change this mailbox"); ?>" />
-<input type="button" class="inb" name="cancel" value="<?php __("Cancel"); ?>" onclick="document.location='mail_list.php?domain=<?php echo urlencode($domain); ?>'"/>
 </form>
+
 <p><small>
 <?php __("help_mail_edit"); ?>
 </small></p>
@@ -92,5 +96,9 @@ if ($error_edit) {
 ?>
 <script type="text/javascript">
 document.forms['main'].email.focus();
+<?php if ($pop==0) { ?>
+  hide('poptbl'); 
+  <?php } ?>
+document.forms['main'].setAttribute('autocomplete', 'off');
 </script>
 <?php include_once("foot.php"); ?>
diff --git a/bureau/admin/mail_list.php b/bureau/admin/mail_list.php
index 9b88f4d9..868ed2cb 100644
--- a/bureau/admin/mail_list.php
+++ b/bureau/admin/mail_list.php
@@ -46,7 +46,7 @@ if(!$domain)
 if(!$res=$mail->enum_doms_mails($domain,1,$letter)) {
   $error=$err->errstr();
 ?>
-<h3><?php printf(_("Mailbox list of the domain %s"),"http://$domain"); ?> : </h3>
+<h3><?php printf(_("Email addresses of the domain %s"),$domain); ?> : </h3>
 <?php
 if ($error) {
   echo "<p class=\"error\">$error</p>";
@@ -62,7 +62,7 @@ else
 {
 
 ?>
-<h3><?php printf(_("Mailbox list of the domain %s"),"http://$domain"); ?> : </h3>
+<h3><?php printf(_("Email addresses of the domain %s"),$domain); ?> : </h3>
 <?php
 if ($error) {
   echo "<p class=\"error\">$error</p>";
@@ -119,7 +119,7 @@ for($i=0;$i<$res["count"];$i++) {
 ?>
 </table>
 <br />
-<input type="submit" class="inb" name="submit" value="<?php __("Delete the selected mailboxes"); ?>" />
+<input type="submit" class="inb" name="submit" value="<?php __("Delete the checked email addresses"); ?>" />
 </form>
 
 <?php
diff --git a/bureau/admin/styles/style.css b/bureau/admin/styles/style.css
index 90c769f7..af315bca 100644
--- a/bureau/admin/styles/style.css
+++ b/bureau/admin/styles/style.css
@@ -56,6 +56,10 @@ h3 {
 	margin: 0px;
 }
 
+.trbtn {
+    text-align: right;
+}
+
 h4 {
 	font-family: Verdana, Arial, Helvetica, sans-serif;
 	font-size: 16px;
@@ -83,6 +87,7 @@ hr {
 	font-size: 10px;
 	border-style: none;
 	color: black;
+	background: white;
 }
 
 .inb {
@@ -369,6 +374,16 @@ a:hover {
     padding-left: 0;
 }
 
+input#email {
+    border-right: 0;
+    padding-right: 0;
+    text-align: right;
+}
+span#emaildom {
+    border-left: 0;
+    padding-left: 2px;
+}
+
 .tedit { 
          border: 1px solid #aaa;
          padding: 6px;
@@ -395,4 +410,8 @@ a:hover {
 
 input#dir, input#sub_local { 
        width: 200px;
- }
\ No newline at end of file
+ }
+
+.warningmsg {
+    width: 500px;
+}
\ No newline at end of file
diff --git a/bureau/locales/fr_FR/LC_MESSAGES/messages.po b/bureau/locales/fr_FR/LC_MESSAGES/messages.po
index 6696bdda..457d0dea 100644
--- a/bureau/locales/fr_FR/LC_MESSAGES/messages.po
+++ b/bureau/locales/fr_FR/LC_MESSAGES/messages.po
@@ -1147,8 +1147,8 @@ msgstr "Valider les changements"
 msgid "help_domain_del %s"
 msgstr ""
 "Si vous voulez détruire le domaine %s, cliquez sur le bouton ci-dessous. "
-"Attention, cela  supprime aussi tous les comptes ftp, email, listes de "
-"diffusions etc. associés à ce domaine et à tous ses sous-domaines !"
+"Attention, cela  supprime aussi tous les comptes ftp, les adresses email, les listes de "
+"diffusion etc... associés à ce domaine et à tous ses sous-domaines !"
 
 #: ../admin/dom_edit.php:170 ../admin/dom_edit.php:172
 #: ../admin/dom_edit.php:173
@@ -1371,16 +1371,16 @@ msgstr "Autres destinataires"
 #: ../admin/mail_add.php:52 ../admin/mail_edit.php:61 ../admin/mail_add.php:55
 #: ../admin/mail_edit.php:68
 msgid "one email per line"
-msgstr "un email par ligne"
+msgstr "une adresse email par ligne"
 
 #: ../admin/mail_add.php:53 ../admin/mail_add.php:56
-msgid "Create this mailbox"
-msgstr "Ajouter cet email"
+msgid "Create this email address"
+msgstr "Ajouter cette adresse email"
 
 #: ../admin/mail_add.php:57 ../admin/mail_add.php:60
 msgid "help_mail_add"
 msgstr ""
-"- Pour créer cet email<br /> * Si vous voulez stocker les emails recus et y "
+"- Pour créer cette adresse email<br /> * Si vous voulez stocker les messages reçus et y "
 "accéder avec un logiciel de messagerie ou le webmail, cochez la case 'Compte "
 "pop'. Dans ce cas, entrez un mot de passe pour le compte pop.<br /> * Si "
 "vous souhaitez rediriger ce mail vers d'autres, entrer la liste des mails "
@@ -1395,46 +1395,49 @@ msgstr ""
 #: ../admin/mail_del.php:42 ../admin/mail_dodel.php:41
 #: ../admin/mail_del.php:63
 msgid "Deleting mail accounts"
-msgstr "Effacement des comptes email"
+msgstr "Suppression des adresses email"
 
 #: ../admin/mail_del.php:43 ../admin/mail_del.php:64
 msgid "Please confirm the deletion of the following mail accounts:"
-msgstr "Confirmez la suppression des comptes emails suivants&nbsp;:"
+msgstr "Confirmez la suppression des adresses email suivantes&nbsp;:"
 
 #: ../admin/mail_del.php:57 ../admin/mail_list.php:107
 #: ../admin/mail_del.php:79
-msgid "Delete the selected mailboxes"
-msgstr "Effacer les mails sélectionnés"
+msgid "Confirm the deletion"
+msgstr "Confirmer la suppression"
+
+msgid "Delete the checked email addresses"
+msgstr "Supprimer les adresses email cochées"
 
 #: ../admin/mail_del.php:57 ../admin/mail_del.php:79
-msgid "Don't delete accounts and go back to the mail list"
-msgstr "Ne rien effacer, retourner à la liste des emails"
+msgid "Don't delete anything and go back to the email list"
+msgstr "Ne rien supprimer, revenir à la liste des adresses email"
 
 #: ../admin/mail_doadd.php:44
 #, php-format
-msgid "The mailbox <b>%s</b> has been successfully created"
-msgstr "Le mail <b>%s</b> a été ajouté avec succès"
+msgid "The email address <b>%s</b> has been successfully created"
+msgstr "L'adresse email <b>%s</b> a été ajouté avec succès"
 
 #: ../admin/mail_dodel.php:48 ../admin/mail_del.php:51
 #: ../admin/mail_dodel.php:40
 #, php-format
-msgid "The mailbox <b>%s</b> does not exist!"
-msgstr "Le mail <b>%s</b> n'existe pas"
+msgid "The email address <b>%s</b> does not exist!"
+msgstr "L'adresse email <b>%s</b> n'existe pas"
 
 #: ../admin/mail_dodel.php:51 ../admin/mail_del.php:53
 #: ../admin/mail_dodel.php:43
 #, php-format
-msgid "The mailbox <b>%s</b> has been deleted!"
-msgstr "La boîte aux lettres <b>%s</b> a été effacée&nbsp;!"
+msgid "The email address <b>%s</b> has been deleted!"
+msgstr "L'adresse email <b>%s</b> a été supprimée&nbsp;!"
 
 #: ../admin/mail_dodel.php:60
-msgid "Back to the mail account list"
-msgstr "Retour à la liste des emails"
+msgid "Back to the email address list"
+msgstr "Retour à la liste des adresses email"
 
 #: ../admin/mail_doedit.php:46
 #, php-format
-msgid "The mailbox <b>%s</b> has been successfully changed"
-msgstr "Le mail <b>%s</b> a été modifié avec succès"
+msgid "The email address <b>%s</b> has been successfully changed"
+msgstr "L'adresse email <b>%s</b> a été modifiée avec succès"
 
 #: ../admin/mail_edit.php:41 ../admin/mail_edit.php:48
 #, php-format
@@ -1477,13 +1480,13 @@ msgstr "Liste des adresses emails du domaine %s"
 #: ../admin/mail_list.php:54 ../admin/mail_list.php:68
 #, php-format
 msgid "Add a mailbox on <b>%s</b>"
-msgstr "Ajouter un email sur <b>%s</b>"
+msgstr "Ajouter une adresse email sur <b>%s</b>"
 
 #: ../admin/mail_list.php:48 ../admin/mail_list.php:67
 #: ../admin/mail_list.php:55 ../admin/mail_list.php:69
 #, php-format
 msgid "Add many mailboxes on <b>%s</b>"
-msgstr "Ajouter plusieurs emails sur <b>%s</b>"
+msgstr "Ajouter plusieurs adresses email sur <b>%s</b>"
 
 #: ../admin/mail_list.php:76 ../admin/mail_list.php:78
 #, php-format
@@ -1535,14 +1538,14 @@ msgstr "Pr
 #: ../admin/mem_chgmail.php:44 ../admin/mem_cm2.php:40 ../admin/mem_cm.php:35
 #: ../admin/mem_cm.php:46 ../admin/mem_param.php:74
 msgid "Change the email of the account"
-msgstr "Changement d'Email du compte"
+msgstr "Changement d'adresse email du compte AlternC"
 
 #: ../admin/mem_chgmail.php:46 ../admin/mem_chgmail.php:51
 #, php-format
 msgid "help_mem_chgmail %s"
 msgstr ""
-"Un email a été envoyé à l'adresse <big><code>%s</code></big> pour "
-"confirmation.<br /> Cet email contient un lien où vous devrez vous rendre "
+"Un essage a été envoyé à l'adresse <big><code>%s</code></big> pour "
+"confirmation.<br /> Ce message contient un lien où vous devrez vous rendre "
 "pour valider la modification.<br /> A cette adresse, la clé suivante vous "
 "sera demandée : <br /> "
 
@@ -1556,7 +1559,7 @@ msgid ""
 "OK button."
 msgstr ""
 "Entrez la clé qui vous a été donnée lors de la demande de changement "
-"d'email, puis cliquez sur OK"
+"d'adresse email, puis cliquez sur OK"
 
 #: ../admin/mem_cm.php:49 ../admin/mem_cm.php:48
 msgid "Key"
@@ -1618,19 +1621,19 @@ msgstr "Changer mon mot de passe"
 #: ../admin/mem_param.php:75
 msgid "help_chg_mail"
 msgstr ""
-"Vous pouvez modifier ici l'email d'inscription correspondant à votre compte."
-"<br />Entrez ici le nouvel email. Un message est envoyé sur cet email pour "
+"Vous pouvez modifier ici l'adresse email d'inscription correspondant à votre compte AlternC."
+"<br />Entrez ici la nouvelle adresse email. Un message est envoyé à cette adresse pour "
 "confirmation."
 
 #: ../admin/mem_param.php:77 ../admin/mem_param.php:74
 #: ../admin/mem_param.php:76
 msgid "Current mailbox"
-msgstr "Email actuel"
+msgstr "Adresse email actuelle"
 
 #: ../admin/mem_param.php:78 ../admin/mem_param.php:75
 #: ../admin/mem_param.php:77
 msgid "New mailbox"
-msgstr "Nouvel Email"
+msgstr "Nouvelle adresse email"
 
 #: ../admin/mem_param.php:79 ../admin/mem_param.php:76
 #: ../admin/mem_param.php:78
@@ -2518,7 +2521,7 @@ msgstr "Administration"
 
 #: ../admin/menu_adm.php:38
 msgid "AlternC configuration"
-msgstr ""
+msgstr "Configuration d'AlternC"
 
 #: ../admin/menu_brouteur.php:33
 msgid "Files and directories"
@@ -2612,7 +2615,7 @@ msgid ""
 "Warning: Deleting an email address will destroy all the messages it contains! You "
 "will <b>NOT</b> be able to get it back!"
 msgstr ""
-"Attention: L'effacement d'une adresse email détruit tous ses messages&nbsp;! "
+"Attention: La suppression d'une adresse email détruit tous ses messages&nbsp;! "
 "Vous ne pourrez <b>PLUS</b> retrouver les messages ainsi effacés&nbsp;!"
 
 #: ../admin/menu.php:36
@@ -2787,7 +2790,7 @@ msgid "as a %s file"
 msgstr "comme fichier %s"
 
 msgid "Show only mail starting by:"
-msgstr "N'afficher que les mails commençant par :"
+msgstr "Afficher seulement les adresses mails commençant par :"
 
 
 msgid "Delete %s from this server"
@@ -2812,3 +2815,6 @@ msgstr "Afficher la liste des domaines avec des informations NS, MX et IP 
 msgid "Redirections<br />Other recipients:"
 msgstr "Redirections/Autres destinataires&nbsp;:"
 
+msgid "Path" 
+msgstr "Répertoire courant"
+