Merge lp:~therp-nl/therp-addons/7.0-fetchmail_inbox-email_from into lp:~therp-nl/therp-addons/7.0

[Stefan Rijnhart (Opener)]

To be consistent with message dicts produced by the mail module

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review)

=== modified file 'fetchmail_inbox/model/mail_message.py'
--- fetchmail_inbox/model/mail_message.py	2014-01-14 11:57:05 +0000
+++ fetchmail_inbox/model/mail_message.py	2014-01-15 10:24:55 +0000
@@ -89,7 +89,7 @@
                     msg[field] = this[field].id
                 else:
                     msg[field] = this[field] or ''
-            msg['from'] = this.author_id.email or ''
+            msg['from'] = this.author_id.email or this['email_from'] or ''
             msg['to'] = ','.join([p.email for p in this.partner_ids])
             msg['partner_ids'] = [(4, p.id) for p in this.partner_ids]
             result[this.id] = msg