diff --git a/addons/email/email_message.py b/addons/email/email_message.py
index 5cfeafd49f2..a5a890dbc55 100644
--- a/addons/email/email_message.py
+++ b/addons/email/email_message.py
@@ -233,7 +233,7 @@ class email_message(osv.osv):
                     for attid in values['attachments_ids']:
                         attachment = attachment_pool.browse(cr, uid, attid, context)#,['datas_fname','datas'])
                         payload[attachment.datas_fname] = attachment.datas
-                result = account_obj.send_mail(cr, uid,
+                result = account_obj.send_email(cr, uid,
                               [values['account_id'][0]],
                               {'To':values.get('email_to') or u'',
                                'CC':values.get('email_cc') or u'',
diff --git a/addons/email/email_smtp_server.py b/addons/email/email_smtp_server.py
index 0ccc5c862b1..bcbeede1fef 100644
--- a/addons/email/email_smtp_server.py
+++ b/addons/email/email_smtp_server.py
@@ -143,14 +143,17 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
 
     def _constraint_unique(self, cr, uid, ids, context=None):
         default_ids = self.search(cr, uid, [('default','=',True)])
+        print "default_ids::",default_ids
         if len(default_ids) > 1:
             return False
+        elif not default_ids:
+            return False
         else:
             return True
 
     _constraints = [
         (_constraint_unique,
-         'Error: You are not allowed to set default more than 1 account.',
+         'Error: You must be define one default smtp server account !.',
          [])
     ]
 
@@ -243,7 +246,7 @@ unless it is already specified in the From Email, e.g: John Doe <john@doe.com>",
             return False
 
 #**************************** MAIL SENDING FEATURES ***********************#
-    def send_mail(self, cr, uid, ids, addresses, subject='', body=None, payload=None, message_id=None, context=None):
+    def send_email(self, cr, uid, ids, addresses, subject='', body=None, payload=None, message_id=None, context=None):
         #TODO: Replace all this with a single email object
         if body is None:
             body = {}
diff --git a/addons/email/email_smtp_server_data.xml b/addons/email/email_smtp_server_data.xml
index f2ee000c16a..166aae754eb 100644
--- a/addons/email/email_smtp_server_data.xml
+++ b/addons/email/email_smtp_server_data.xml
@@ -3,7 +3,7 @@
     <data noupdate="1">
 		<record id="email_smtp_server_administrator0" model="email.smtp_server">
 			<field name="name">Administrator</field>
-			<field eval="0" name="default"/>
+			<field eval="1" name="default"/>
 			<field eval="1" name="smtptls"/>
 			<field name="email_id">example@test.com</field>
 			<field name="state">draft</field>