[FIX]mail: backport of fix 8787 from saas-1 branch, rev-id: chm@openerp.com-20131003091603-rarztafazl56ugid
Merge branch 'master' of bzr::lp:openobject-addons/7.0 into 7.0