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