Add check in single mail for Penpal.deliver