[MERGE] Merged with main addons

[odoo/odoo.git] / addons / mail / mail_message.py

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 8b89b61..b22b0c7 100644 (file)
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -159,7 +159,7 @@ class mail_message(osv.osv):
                     msg_txt += truncate_text(message.body_text)
             else:
                 msg_txt = (message.user_id.name or '/') + _(' on ') + format_date_tz(message.date, tz) + ':\n\t'
-                msg_txt += message.subject
+                msg_txt += (message.subject or '')
             result[message.id] = msg_txt
         return result