diff --git a/addons/email/email_message.py b/addons/email/email_message.py
index fa710df4dd2..144f310650b 100644
--- a/addons/email/email_message.py
+++ b/addons/email/email_message.py
@@ -169,7 +169,6 @@ class email_message(osv.osv):
         'attachment_ids': fields.many2many('ir.attachment', 'message_attachment_rel', 'message_id', 'attachment_id', 'Attachments', readonly=True),
         'display_text': fields.function(_get_display_text, method=True, type='text', size="512", string='Display Text'),
         'reply_to':fields.char('Reply-To', size=250, readonly=True),
-        'account_id' :fields.many2one('email.smtp_server', 'User account', readonly=True),
         'sub_type': fields.char('Sub Type', size=32, readonly=True),
         'x_headers': fields.char('x_headers',size=256, readonly=True),
         'priority':fields.integer('Priority', readonly=True),
@@ -237,7 +236,7 @@ class email_message(osv.osv):
 
 
     def email_send(cr, uid, email_from, email_to, subject, body, model=False, email_cc=None, email_bcc=None, reply_to=False, attach=None,
-            openobject_id=False, debug=False, subtype='plain', x_headers=None, priority='3', smtp_id=False):
+            openobject_id=False, debug=False, subtype='plain', x_headers=None, priority='3'):
         attachment_obj = self.pool.get('ir.attachment')
         msg_vals = {
                 'name': subject,
@@ -251,7 +250,6 @@ class email_message(osv.osv):
                 'email_bcc': email_bcc or '',
                 'reply_to': reply_to or '',
                 'message_id': openobject_id,
-                'account_id': smtp_id,
                 'sub_type': subtype or '',
                 'x_headers': x_headers or '',
                 'priority': priority,
@@ -295,12 +293,9 @@ class email_message(osv.osv):
                 for attach in message.attachment_ids:
                     attachments.append((attach.datas_fname ,attach.datas))
                 smtp_account = False
-                if message.account_id:
-                    account_id = smtp_account
-                else:
-                    smtp_ids = account_obj.search(cr, uid, [('default','=',True)])
-                    if smtp_ids:
-                        smtp_account = account_obj.browse(cr, uid, smtp_ids, context)[0]
+                smtp_ids = account_obj.search(cr, uid, [('default','=',True)])
+                if smtp_ids:
+                    smtp_account = account_obj.browse(cr, uid, smtp_ids, context)[0]
                 tools.email_send(message.email_from, message.email_to, message.name, message.message, email_cc=message.email_cc,
                         email_bcc=message.email_bcc, reply_to=message.reply_to, attach=attachments, openobject_id=message.message_id,
                         subtype=message.sub_type, x_headers=message.x_headers, priority=message.priority, debug=message.debug,
diff --git a/addons/email/email_view.xml b/addons/email/email_view.xml
index 269668066c3..2342c7052bd 100644
--- a/addons/email/email_view.xml
+++ b/addons/email/email_view.xml
@@ -42,7 +42,6 @@
                             <field name="attachment_ids" nolabel="1" colspan="4" readonly="1"/>
                         </page>
                         <page string="Advanced">
-                            <field name="account_id" colspan="2" />
                             <field name="folder" colspan="2" select="2"/>
                             <field name="state"/>
                             <field name="sub_type"/>
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 5f2b6d14afc..136bb754a8d 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -538,7 +538,6 @@ This is useful for CRM leads for example"),
                                       template.def_body_html,
                                       template,
                                       context),
-            'account_id' :from_account['id'],
             #This is a mandatory field when automatic emails are sent
             'state':'na',
             'folder':'drafts',
@@ -552,9 +551,9 @@ This is useful for CRM leads for example"),
         elif template['track_campaign_item']:
             # get appropriate message-id
             mailbox_values.update({'message_id': tools.misc.generate_tracking_message_id(record_id)})
-
-        if not mailbox_values['account_id']:
-            raise Exception("Unable to send the mail. No account linked to the template.")
+#
+#        if not mailbox_values['account_id']:
+#            raise Exception("Unable to send the mail. No account linked to the template.")
         #Use signatures if allowed
         if template.use_sign:
             sign = self.pool.get('res.users').read(cursor,