=== modified file 'email_template/wizard/mail_compose_message.py'
--- email_template/wizard/mail_compose_message.py	2013-03-14 08:53:15 +0000
+++ email_template/wizard/mail_compose_message.py	2013-06-21 08:39:24 +0000
@@ -140,7 +140,7 @@
             mail.compose.message, transform email_cc and email_to into partner_ids """
         template_values = self.pool.get('email.template').generate_email(cr, uid, template_id, res_id, context=context)
         # filter template values
-        fields = ['body_html', 'subject', 'email_to', 'email_recipients', 'email_cc', 'attachment_ids', 'attachments']
+        fields = ['body_html', 'email_from','subject', 'email_to', 'email_recipients', 'email_cc', 'attachment_ids', 'attachments']
         values = dict((field, template_values[field]) for field in fields if template_values.get(field))
         values['body'] = values.pop('body_html', '')
 

=== modified file 'mail/mail_followers.py'
--- mail/mail_followers.py	2013-05-13 14:26:33 +0000
+++ mail/mail_followers.py	2013-06-21 08:48:12 +0000
@@ -153,13 +153,13 @@
         if signature:
             body_html = tools.append_content_to_html(body_html, signature, plaintext=True, container_tag='div')
 
-        # email_from: partner-user alias or partner email or mail.message email_from
-        if msg.author_id and msg.author_id.user_ids and msg.author_id.user_ids[0].alias_domain and msg.author_id.user_ids[0].alias_name:
+        # email_from: mail.message email_from or partner-user alias or partner email
+        if msg.email_from:
+            email_from = msg.email_from
+        elif msg.author_id and msg.author_id.user_ids and msg.author_id.user_ids[0].alias_domain and msg.author_id.user_ids[0].alias_name:
             email_from = '%s <%s@%s>' % (msg.author_id.name, msg.author_id.user_ids[0].alias_name, msg.author_id.user_ids[0].alias_domain)
         elif msg.author_id:
             email_from = '%s <%s>' % (msg.author_id.name, msg.author_id.email)
-        else:
-            email_from = msg.email_from
 
         references = False
         if msg.parent_id:

=== modified file 'mail/wizard/mail_compose_message.py'
--- mail/wizard/mail_compose_message.py	2013-04-17 08:14:10 +0000
+++ mail/wizard/mail_compose_message.py	2013-06-21 08:58:40 +0000
@@ -237,6 +237,7 @@
                     'parent_id': wizard.parent_id and wizard.parent_id.id,
                     'partner_ids': [partner.id for partner in wizard.partner_ids],
                     'attachment_ids': [attach.id for attach in wizard.attachment_ids],
+                    'email_from': wizard.email_from,
                 }
                 # mass mailing: render and override default values
                 if mass_mail_mode and wizard.model:

=== modified file 'mail/wizard/mail_compose_message_view.xml'
--- mail/wizard/mail_compose_message_view.xml	2013-04-17 08:14:10 +0000
+++ mail/wizard/mail_compose_message_view.xml	2013-06-21 09:01:51 +0000
@@ -13,6 +13,7 @@
                         <field name="res_id" invisible="1"/>
                         <field name="parent_id" invisible="1"/>
                         <!-- visible wizard -->
+                        <field name="email_from" placeholder="Lasciare vuoto per usare Indirizzo email dell'utente corrente"/>
                         <label for="partner_ids" string="Recipients"
                              invisible="context.get('mail_compose_log', False)"/>
                         <div groups="base.group_user" invisible="context.get('mail_compose_log', False)">