Changes for ship email issue by esparkinfo on 8 july 2014