Fixed ActionMailer
Lots of updates