Merge lp:~therp-nl/ocb-addons/6.1_lp1044359 into lp:ocb-addons/6.1

[Holger Brunn (Therp)]

[Stefan Rijnhart (Opener) (stefan-opener)]

LGTM

review: Approve

=== modified file 'mail/mail_message.py'
--- mail/mail_message.py	2012-09-24 14:02:33 +0000
+++ mail/mail_message.py	2013-05-08 08:06:26 +0000
@@ -534,7 +534,14 @@
                                                 mail_server_id=message.mail_server_id.id,
                                                 context=context)
                 if res:
-                    message.write({'state':'sent', 'message_id': res})
+                    message.write(
+                            {
+                                'state':'sent',
+                                'message_id': res,
+                                'user_id': message.user_id.id or uid,
+                                'date': message.date
+                                    or datetime.datetime.now(),
+                            })
                     message_sent = True
                 else:
                     message.write({'state':'exception'})