diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index 611b7c178fb..32b4ade2d27 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -137,7 +137,8 @@ class email_server(osv.osv):
             ('imap','IMAP Server'),
         ],'State', select=True, readonly=False),
         'is_ssl':fields.boolean('SSL ?', required=False),
-        'date': fields.date('Date'),
+        'attach':fields.boolean('Add Attachments ?', required=False),
+        'date': fields.date('Date', readonly=True, states={'draft':[('readonly',False)]}),
         'user' : fields.char('User Name', size=256, required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'password' : fields.char('Password', size=1024, invisible=True, required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'note': fields.text('Description'),
@@ -292,17 +293,18 @@ class email_server(osv.osv):
             else:
                 logger.notifyChannel('imap', netsvc.LOG_WARNING, 'method def message_new is not define in model %s' % (model_pool._name))
                 return False
-                
-#            for attactment in attachents or []:
-#                data_attach = {
-#                    'name': attactment,
-#                    'datas':binascii.b2a_base64(str(attachents.get(attactment))),
-#                    'datas_fname': attactment,
-#                    'description': 'Mail attachment',
-#                    'res_model': server.object_id.model,
-#                    'res_id': res_id,
-#                }
-#                self.pool.get('ir.attachment').create(cr, uid, data_attach)
+            
+            if server.attach:
+                for attactment in attachents or []:
+                    data_attach = {
+                        'name': attactment,
+                        'datas':binascii.b2a_base64(str(attachents.get(attactment))),
+                        'datas_fname': attactment,
+                        'description': 'Mail attachment',
+                        'res_model': server.object_id.model,
+                        'res_id': res_id,
+                    }
+                    self.pool.get('ir.attachment').create(cr, uid, data_attach)
             
             if server.action_id:
                 action_pool = self.pool.get('ir.actions.server')
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index a3a8534b559..d457f9636f1 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -26,15 +26,15 @@
                     <group col="6" colspan="4">
                         <field name="name" select="1" colspan="4"/>
                         <field name="type" select="1" on_change="onchange_server_type(type, is_ssl)"/>
-                        
                         <field name="date" select="1"/>
-                        <field name="is_ssl" select="1" on_change="onchange_server_type(type, is_ssl)"/>
+                        <field name="attach"/>
                         <field name="active" select="1"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Server &amp; Login">
                             <group col="2" colspan="2">
                                 <separator string="Server Information" colspan="2"/>
+                                <field name="is_ssl" select="1" on_change="onchange_server_type(type, is_ssl)"/>
                                 <field name="server" />
                                 <field name="port" />
                             </group>