diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index dfa2a9b7009..e5e1c92daef 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -117,6 +117,8 @@ and users by email"),
                          domain="[('section_id','=',section_id),\
                         ('object_id.model', '=', 'crm.lead')]"),
         'partner_name': fields.char("Partner Name", size=64),
+        'optin': fields.selection([('yes','Yes'),('no','No'),('unknown','/')],'Opt-In'),
+        'optout': fields.selection([('yes','Yes'),('no','No'),('unknown','/')],'Opt-Out'),
         'type':fields.selection([
             ('lead','Lead'),
             ('opportunity','Opportunity'),
@@ -148,6 +150,8 @@ and users by email"),
         'user_id': crm_case._get_default_user,
         'email_from': crm_case._get_default_email,
         'state': lambda *a: 'draft',
+        'optin': lambda *a: 'unknown',
+        'optout': lambda *a: 'unknown',
         'section_id': crm_case._get_section,
         'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.lead', context=c),
         'priority': lambda *a: crm.AVAILABLE_PRIORITIES[2][0],
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 9fe9b8e6170..0c5afb27739 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -146,6 +146,11 @@
                         <field name="date_open"/>
                         <field name="date_closed"/>
                     </group>
+                    <group colspan="2" col="2">
+                        <separator string="Mailings" colspan="2" col="2"/>
+                        <field name="optin"/>
+                        <field name="optout"/>
+                    </group>
                     <group colspan="2" col="2">
                         <separator string="Statistics" colspan="2" col="2"/>
                         <field name="day_open"/>
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index 8abbf9eb706..16e45a36c96 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -28,9 +28,15 @@
                 "document",
                 "email_template"
                 ],
-    "author" : "Tiny",
+    "author" : "OpenERP SA",
     "category": 'Generic Modules/Marketing',
     "description": """
+Allows you to setup leads automation through marketing campaigns. The campaigns
+are dynamic and multi-channels. The process:
+* Design marketing campaigns that incluces mail templates, reports to print,
+  miscelleanous actions, etc.
+* Define segments that are selections of target people
+* Launch your campaign to automate communications.
     """,
     'website': 'http://www.openerp.com',
     'init_xml': [],