CakeEmail: Backport e9b613de7d into 1.4.x