More actionmailer changes