From ff00a84d33881ef8ca8965a688a8ce05421528d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Thu, 20 Jun 2013 15:57:18 +0200
Subject: [PATCH] [FIX] mail: fixed a glitch in message_subscribe sometimes
 overriding specified subtypes

bzr revid: tde@openerp.com-20130620135718-qi0d8fpqvombq3v1
---
 addons/mail/mail_thread.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 349122e5942..a138aa230db 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -1186,7 +1186,7 @@ class mail_thread(osv.AbstractModel):
                                                     ], context=context)
                 mail_followers_obj.write(cr, SUPERUSER_ID, fol_ids, {'subtype_ids': [(6, 0, subtype_ids)]}, context=context)
             # subtype_ids not specified: do not update already subscribed partner, fetch default subtypes for new partners
-            else:
+            elif subtype_ids is None:
                 subtype_ids = subtype_obj.search(cr, uid, [
                                                         ('default', '=', True),
                                                         '|',