Added track handling in MailHandler