diff --git a/addons/email/email_message.py b/addons/email/email_message.py
index 144f310650b..52e8a1f0af0 100644
--- a/addons/email/email_message.py
+++ b/addons/email/email_message.py
@@ -305,7 +305,7 @@ class email_message(osv.osv):
             except Exception, error:
                 logger = netsvc.Logger()
                 logger.notifyChannel("email-template", netsvc.LOG_ERROR, _("Sending of Mail %s failed. Probable Reason:Could not login to server\nError: %s") % (message.id, error))
-        return True
+        return ids
 
 #    def send_all_mail(self, cr, uid, ids=None, context=None):
 #        if ids is None:
diff --git a/addons/email/email_view.xml b/addons/email/email_view.xml
index 2342c7052bd..4f598b7fced 100644
--- a/addons/email/email_view.xml
+++ b/addons/email/email_view.xml
@@ -48,7 +48,7 @@
                             <field name="x_headers"/>
                             <field name="priority"/>
                             <field name="debug"/>
-                            <button name="process_queue" string="Process Queue" type="object" icon="gtk-action"/>
+                            <button name="process_queue" string="Process Queue" type="object" icon="gtk-execute"/>
                         </page>
                     </notebook>
                 </form>
diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py
index 136bb754a8d..d2e63ff960c 100644
--- a/addons/email_template/email_template.py
+++ b/addons/email_template/email_template.py
@@ -542,6 +542,7 @@ This is useful for CRM leads for example"),
             'state':'na',
             'folder':'drafts',
             'mail_type':'multipart/alternative',
+            'template_id': template.id
         }
 
         if template['message_id']:
@@ -556,20 +557,12 @@ This is useful for CRM leads for example"),
 #            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,
-                                                   user,
-                                                   user,
-                                                   ['signature'],
-                                                   context)['signature']
+            sign = self.pool.get('res.users').read(cursor, user, user, ['signature'], context)['signature']
             if mailbox_values['body_text']:
                 mailbox_values['body_text'] += sign
             if mailbox_values['body_html']:
                 mailbox_values['body_html'] += sign
-        mailbox_id = self.pool.get('email.message').create(
-                                                             cursor,
-                                                             user,
-                                                             mailbox_values,
-                                                             context)
+        mailbox_id = self.pool.get('email.message').create(cursor, user, mailbox_values, context)
 
         return mailbox_id
 
@@ -589,28 +582,11 @@ This is useful for CRM leads for example"),
                                                                 template,
                                                                 record_id,
                                                                 context)
-            mail = mailbox_obj.browse(
-                                        cursor,
-                                        user,
-                                        mailbox_id,
-                                        context=context
+            mail = mailbox_obj.browse(cursor, user, mailbox_id, context=context
                                               )
             if template.report_template or template.attachment_ids:
-                self.generate_attach_reports(
-                                              cursor,
-                                              user,
-                                              template,
-                                              record_id,
-                                              mail,
-                                              context
-                                              )
-            self.pool.get('email.message').write(
-                                                cursor,
-                                                user,
-                                                mailbox_id,
-                                                {'folder':'outbox'},
-                                                context=context
-            )
+                self.generate_attach_reports(cursor, user, template, record_id, mail, context )
+            self.pool.get('email.message').write(cursor, user, mailbox_id, {'folder':'outbox'}, context=context)
             # TODO : manage return value of all the records
             result = self.pool.get('email.message').process_email_queue(cursor, user, [mailbox_id], context)
 
@@ -618,4 +594,22 @@ This is useful for CRM leads for example"),
 
 email_template()
 
+class email_message(osv.osv):
+    _inherit = 'email.message'
+    _columns = {
+        'template_id': fields.many2one('email.template', 'Email-Template', readonly=True),
+        }
+
+    def process_email_queue(self, cr, uid, ids=None, context=None):
+        result = super(email_template, self).copy(cr, uid, id, default, context)
+        attachment_obj = self.pool.get('ir.attachment')
+        for message in self.browse(cr, uid, result, context):
+            if message.template_id and message.template_id.auto_delete:
+                self.unlink(cr, uid, [id], context=context)
+                attachment_ids = [x.id for x in message.attachments_ids]
+                attachment_obj.unlink(cr, uid, attachment_ids, context=context)
+        return result
+
+email_message()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index e2032b701e1..c9286982683 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -155,6 +155,21 @@
 
         <menuitem name="Email Templates" id="menu_email_template_all_tools"
             parent="base.menu_lunch_survey_root" action="action_email_template_tree_all" />
+
+	<!-- Inherit email.message view -->
+
+        <record model="ir.ui.view" id="view_email_message_template_form">
+            <field name="name">email.message.template.form</field>
+            <field name="model">email.message</field>
+            <field name="inherit_id" ref="email.view_email_message_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+	            <field name="debug" position="after">
+	                <field name="template_id"/>
+	            </field>
+            </field>
+        </record>
+
     </data>
 </openerp>