Updated mailer + cleaned up 404
Fixed mailer merge conflict