Fixed email delivery issue
Merge branch 'dev' of github.com:nimeshnikum/bulk_email into dev