Updated mail feature and rspec