Mails: Now tracks returns and fixed several issues