Revert "[FIX] mass_mailing: revert typo forward port ed0233f"
Revert "[FIX] mass_mailing: revert typo forward port ed0233f"

This reverts commit 75d9674d4 and revert well 551719a81e which wass done
on mail.mass_mailing instead of mail.template (on which it should not be
done).

hip-odoo/odoo,ygol/odoo,hip-odoo/odoo,ygol/odoo,ygol/odoo,hip-odoo/odoo,ygol/odoo,ygol/odoo,ygol/odoo,hip-odoo/odoo,hip-odoo/odoo,hip-odoo/odoo,ygol/odoo