diff --git a/htdocs/comm/mailing/fiche.php b/htdocs/comm/mailing/fiche.php
index 4fae195225b..d2b2b77776d 100644
--- a/htdocs/comm/mailing/fiche.php
+++ b/htdocs/comm/mailing/fiche.php
@@ -227,7 +227,7 @@ if ($_GET["action"] == 'create')
 
     print '<table class="border" width="100%">';
 
-    print '<tr><td width="20%">'.$langs->trans("MailFrom").'</td><td><input class="flat" name="from" size="40" value="'.MAIN_MAIL_FROM.'"></td></tr>';
+    print '<tr><td width="20%">'.$langs->trans("MailFrom").'</td><td><input class="flat" name="from" size="40" value="'.$conf->mailing->email_from.'"></td></tr>';
 
     print '<tr><td width="20%">'.$langs->trans("MailTitle").'</td><td><input class="flat" name="titre" size="40" value=""></td></tr>';
 
diff --git a/htdocs/docsoc.php b/htdocs/docsoc.php
index d91692e6600..88b487baab3 100644
--- a/htdocs/docsoc.php
+++ b/htdocs/docsoc.php
@@ -56,7 +56,7 @@ if (! is_dir($upload_dir))
 /*
  * Action envoie fichier
  */
-if ( $_POST["sendit"] && defined('MAIN_UPLOAD_DOC') && MAIN_UPLOAD_DOC == 1)
+if ( $_POST["sendit"] && $conf->upload)
 {
     if (is_dir($upload_dir))
     {
@@ -181,7 +181,7 @@ if ($socid > 0)
         if ($mesg) { print "$mesg<br>"; }
 
         // Affiche forumlaire upload
-        if (defined('MAIN_UPLOAD_DOC') && MAIN_UPLOAD_DOC == 1)
+        if (defined('MAIN_UPLOAD_DOC') && $conf->upload)
         {
             print_titre($langs->trans("AttachANewFile"));
             echo '<form name="userfile" action="docsoc.php?socid='.$socid.'" enctype="multipart/form-data" METHOD="POST">';
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 90ffee46e99..f491bd4977a 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -343,10 +343,18 @@ if ($user->liste_limit > 0)
   $conf->liste_limit = $user->liste_limit;
 }
 
-if (defined('MAIN_MAIL_FROM'))
+// $conf->email_from          = email pour envoi par Dolibarr des mails auto (notifications, ...)
+// $conf->mailing->email_from = email pour envoi par Dolibarr des mailings
+$conf->email_from="dolibarr-robot@domain.com";
+if (defined('MAIN_EMAIL_FROM'))
 {
-    $conf->email_from=MAIN_MAIL_FROM;
+    $conf->email_from=MAIN_EMAIL_FROM;
 }
+if (defined('MAILING_EMAIL_FROM'))
+{
+    $conf->mailing->email_from=MAILING_EMAIL_FROM;
+}
+else $conf->mailing->email_from=$conf->email_from;
 
 if (defined('MAIN_THEME'))
 {
diff --git a/mysql/data/data.sql b/mysql/data/data.sql
index 0e783bfb5c4..faf8026df32 100644
--- a/mysql/data/data.sql
+++ b/mysql/data/data.sql
@@ -47,13 +47,11 @@ insert into llx_action_def (rowid,code,titre,description,objet_type) values (2,'
 --
 -- Constantes de configuration
 --
-insert into llx_const (name, value, type, note, visible) values ('MAIN_MONNAIE','EUR','chaine','Monnaie',0);
-
-insert into llx_const (name, value, type, note, visible) values ('MAIN_UPLOAD_DOC','1','chaine','Autorise l\'upload de document',1);
 insert into llx_const (name, value, type, note, visible) values ('MAIN_NOT_INSTALLED','1','chaine','Test d\'installation',1);
-insert into llx_const (name, value, type, note, visible) values ('MAIN_MAIL_FROM','dolibarr-robot@domain.com','chaine','EMail emetteur pour les notifications automatiques Dolibarr',1);
+insert into llx_const (name, value, type, note, visible) values ('MAIN_UPLOAD_DOC','1','chaine','Autorise l\'upload de documents',0);
 
-insert into llx_const (name, value, type, note, visible) values ('MAIN_TITLE','Dolibarr','chaine','Titre des pages',0);
+insert into llx_const (name, value, type, note, visible) values ('MAIN_MONNAIE','EUR','chaine','Monnaie',0);
+insert into llx_const (name, value, type, note, visible) values ('MAIN_EMAIL_FROM','dolibarr-robot@domain.com','chaine','EMail emetteur pour les envois automatiques Dolibarr (Notifications, ...)',1);
 
 insert into llx_const (name, value, type, note, visible) values ('COMPTA_ONLINE_PAYMENT_BPLC','1','yesno','Système de gestion de la banque populaire de Lorraine',0);
 
@@ -88,7 +86,7 @@ insert into llx_const (name, value, type, note, visible) values ('ADHERENT_MAIL_
 --
 -- Mail Mailing
 --
-insert into llx_const (name, value, type, note) values ('MAILING_EMAIL_FROM','mailing@societe.com','chaine','Champ From du mail pour mailing clients/prospects');
+insert into llx_const (name, value, type, note) values ('MAILING_EMAIL_FROM','mailing@domain.com','chaine','EMail emmetteur pour les envois de mailings');
 
 --
 -- Mailman
diff --git a/mysql/migration/1.1.0-2.0.0.sql b/mysql/migration/1.1.0-2.0.0.sql
index 05aba19d11d..08abb5284fd 100644
--- a/mysql/migration/1.1.0-2.0.0.sql
+++ b/mysql/migration/1.1.0-2.0.0.sql
@@ -628,9 +628,11 @@ create table llx_paiement_facture
 )type=innodb;
 
 
-insert into llx_const(name, value, type, note, visible) values ('MAIN_UPLOAD_DOC','1','chaine','Authorise l\'upload de document',1);
+insert into llx_const(name, value, type, note, visible) values ('MAIN_UPLOAD_DOC','1','chaine','Authorise l\'upload de document',0);
 insert into llx_const(name, value, type, note, visible) values ('MAIN_SEARCHFORM_PRODUITSERVICE','1','yesno','Affichage formulaire de recherche des Produits et Services dans la barre de gauche',0);
 delete from llx_const where name = 'COMPTA_BANK_FACTURES';
+update llx_const set visible='0' where name='MAIN_UPLOAD_DOC';
+update llx_const set visible='0' where name='MAIN_TITLE';
 
 update llx_bank set fk_type = 'VAD' where fk_type = 'WWW';
 
@@ -1593,5 +1595,6 @@ insert into llx_const (name, value, type, visible, note) VALUES ('MAIN_FORCE_SET
 insert into llx_const (name, value, type, visible, note) VALUES ('MAIN_FORCE_SETLOCALE_LC_NUMERIC',  'MAIN_FORCE_SETLOCALE_LC_NUMERIC', 'chaine', 1, 'Mettre la valeur C si problème de centimes');
 
 
-update llx_const set name='OSC_DB_NAME' where name'DB_NAME_OSC';
+update llx_const set name='OSC_DB_NAME' where name='DB_NAME_OSC';
+update llx_const set name='MAIN_EMAIL_FROM' where name='MAIN_MAIL_FROM';