reverted actionmailer dependency back to 3.1