Improve legacy swift mailer compatibility