diff --git a/bureau/admin/mail_add.php b/bureau/admin/mail_add.php
index 4174795c..a45e5a95 100644
--- a/bureau/admin/mail_add.php
+++ b/bureau/admin/mail_add.php
@@ -74,11 +74,14 @@ if (!empty($dst_mail)) $pop=0;
 </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; echo ((empty($alias) && !empty($dst_mail))?"":"\n").$dst_mail; ?></textarea></td></tr>
+
+<!-- 
 <tr><td>
    <?php echo __("Is it a temporary mail account?"); ?><br/>
 </td><td>
     <?php include_once("trash_dateselect.php"); ?>
 </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"); ?>" />
diff --git a/bureau/admin/mail_doadd.php b/bureau/admin/mail_doadd.php
index 501eb72a..b5a4217f 100644
--- a/bureau/admin/mail_doadd.php
+++ b/bureau/admin/mail_doadd.php
@@ -40,7 +40,6 @@ $fields = array (
 );
 getFields($fields);
 
-
 if ($pass != $passconf) {
 	$error = _("Passwords do not match");
 	include("mail_add.php");
diff --git a/bureau/admin/mail_doedit.php b/bureau/admin/mail_doedit.php
index 55babad1..9847156e 100644
--- a/bureau/admin/mail_doedit.php
+++ b/bureau/admin/mail_doedit.php
@@ -33,6 +33,18 @@ $error_edit="";
 $trash=new m_trash();
 $trash->getfromform();
 
+
+$fields = array (
+	"domain"    => array ("request", "string", ""),
+	"email"       => array ("request", "string", ""),
+	"pop"       => array ("request", "integer", 0),
+	"pass"       => array ("request", "string", ""),
+	"passconf"       => array ("request", "string", ""),
+	"alias"       => array ("request", "string", ""),
+);
+getFields($fields);
+
+
 if ($pass != $passconf) {
 	$error = _("Passwords do not match");
 	include ("mail_edit.php");
diff --git a/bureau/admin/mail_edit.php b/bureau/admin/mail_edit.php
index 0dad974e..e70f6b58 100644
--- a/bureau/admin/mail_edit.php
+++ b/bureau/admin/mail_edit.php
@@ -86,12 +86,13 @@ echo "<div class=\"warningmsg\">"._("WARNING: turning POP/IMAP off will DELETE t
 </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><td>
    <?php echo __("Is it a temporary mail account?"); ?><br/>
 </td><td>
     <?php include_once("trash_dateselect.php"); ?>
 </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); ?>'"/>