diff --git a/htdocs/includes/modules/modDocument.class.php b/htdocs/includes/modules/modDocument.class.php
index 4b65034550a8a22aea9eb74b00bdb01a15a3ca36..7c075bd65246f458fc851c28f3e8e4d4493ebf62 100644
--- a/htdocs/includes/modules/modDocument.class.php
+++ b/htdocs/includes/modules/modDocument.class.php
@@ -49,24 +49,24 @@ class modDocument extends DolibarrModules
 		$this->db = $DB ;
 		$this->numero = 51 ;
 
-		$this->family = "other";
+		$this->family = "technic";
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
 		$this->name = eregi_replace('^mod','',get_class($this));
-		$this->description = "Generation de courriers/publipostages";
+		$this->description = "Generation de courriers/publipostages papiers";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'development';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->special = 3;
-		$this->picto='dir';
+		$this->special = 0;
+		$this->picto='email';
 
 		// Data directories to create when module is enabled
-		$this->dirs = array("/ged/temp");
+		$this->dirs = array("/document/temp");
 
 		// Config pages
 		//$this->config_page_url = array("document.php");
 
-		// D�pendances
+		// Dependencies
 		$this->depends = array();
 		$this->requiredby = array();
 		$this->conflictwith = array();
diff --git a/htdocs/includes/modules/modMailing.class.php b/htdocs/includes/modules/modMailing.class.php
index c4c6383ca07311613068556108561a603fdcd234..64f1baa9a187a612e92ecad71420f05ab89cb048 100644
--- a/htdocs/includes/modules/modMailing.class.php
+++ b/htdocs/includes/modules/modMailing.class.php
@@ -19,23 +19,23 @@
  */
 
 /**
- \defgroup   mailing  Module mailing
- \brief      Module pour gerer les mailings
- \version	$Id$
+ *	\defgroup   mailing  Module mailing
+ *	\brief      Module pour gerer les mailings
+ *	\version	$Id$
  */
 
 /**
- \file       htdocs/includes/modules/modMailing.class.php
- \ingroup    mailing
- \brief      Fichier de description et activation du module Mailing
+ *	\file       htdocs/includes/modules/modMailing.class.php
+ *	\ingroup    mailing
+ *	\brief      Fichier de description et activation du module Mailing
  */
 
 include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
 
 
 /**
- \class      modMailing
- \brief      Classe de description et activation du module Mailing
+ *	\class      modMailing
+ *	\brief      Classe de description et activation du module Mailing
  */
 class modMailing extends DolibarrModules
 {
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 1971d31ee491fcd690d5307b5fc3b1134e694421..acaccd5a6c322d966fd1130ff4f7ca09b62df3ad 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -252,8 +252,8 @@ Module10Name=Accountancy
 Module10Desc=Simple accountancy management (invoice and payment dispatching)
 Module20Name=Proposals
 Module20Desc=Commercial proposals' management
-Module22Name=E-mailings
-Module22Desc=E-mailings' management
+Module22Name=Mass E-mailings
+Module22Desc=Mass E-mailings' management
 Module25Name=Customer Orders
 Module25Desc=Customer orders' management
 Module30Name=Invoices
@@ -266,6 +266,8 @@ Module49Name=Editors
 Module49Desc=Editors' management
 Module50Name=Products
 Module50Desc=Products' management
+Module51Name=Mass mailings
+Module51Desc=Mass paper mailings' management
 Module52Name=Stocks
 Module52Desc=Stocks' management of products
 Module53Name=Services
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 7c7a54acc155c407ddc019cae4e25ebe5e115ea2..e72171031d5d3b8661aae064c574e23b235de4b6 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -265,6 +265,8 @@ Module49Name = Éditeurs
 Module49Desc = Gestion des éditeurs
 Module50Name = Produits
 Module50Desc = Gestion des produits
+Module51Name = Publipostage
+Module51Desc = Administration et envoi de courriers papiers en masse
 Module52Name = Stocks de produits
 Module52Desc = Gestion des stocks de produits
 Module53Name = Services