DRPL-391 | Changed Email Delivery System