Final commit. All issues resolved. Mailer working fine.