diff --git a/include/lib/mail_parameter.class.php b/include/lib/mail_parameter.class.php
index 61421049a..fc8339cbd 100644
--- a/include/lib/mail_parameter.class.php
+++ b/include/lib/mail_parameter.class.php
@@ -239,7 +239,7 @@ class Mail_Parameter
     {
         $mail_parameter=new Mail_Parameter($cnx,MAIL_SETTING_NOALYSS);
         if ( $mail_parameter->smtp_type=="sendmail") {
-            return new Sendmail($mail_parameter->smtp_replyto,$mail_parameter->smtp_replyto);
+            return new \Sendmail($mail_parameter->smtp_replyto,$mail_parameter->smtp_replyto);
         } elseif ($mail_parameter->smtp_type=="smtp") {
             $phpmail= new SMTPMail($mail_parameter);
             return $phpmail;
diff --git a/include/modele.inc.php b/include/modele.inc.php
index b32d7a518..cf987e42d 100644
--- a/include/modele.inc.php
+++ b/include/modele.inc.php
@@ -146,6 +146,7 @@ if (isset($_POST["FMOD_NAME"]))
         // clean parameter 
         $Res= $cn_mod->exec_sql('update "parameter" set pr_value=null');
         $Res= $cn_mod->exec_sql('update "parameter_extra" set pe_value=null');
+        $Res= $cn_mod->exec_sql('update parm_mail_server set pe_value=null');
 
         // clean forecast
         // 
diff --git a/include/sql/patch/upgrade204.sql b/include/sql/patch/upgrade204.sql
index 29545e92d..62a0b505b 100644
--- a/include/sql/patch/upgrade204.sql
+++ b/include/sql/patch/upgrade204.sql
@@ -300,7 +300,6 @@ DROP FUNCTION comptaproc.jrn_add_note(int8, text);
 
 CREATE OR REPLACE FUNCTION comptaproc.jrn_add_note(p_jrid bigint, p_note text,p_note_html text)
  RETURNS void
- LANGUAGE plpgsql
 AS $function$
 declare
 	tmp bigint;
@@ -324,7 +323,7 @@ begin
 	return;
 end;
 $function$
-;
+ LANGUAGE plpgsql;
 
 CREATE TABLE public.parm_mail_server (
 	pe_id int4 GENERATED ALWAYS AS IDENTITY( INCREMENT BY 1 MINVALUE 1 MAXVALUE 2147483647 START 1 CACHE 1 NO CYCLE) NOT NULL, -- pk